This is an automated email from the ASF dual-hosted git repository. lewismc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-sdap-mudrod.git
commit ba9cd454961954b5b399f2020c8ada7ffc0db4d9 Merge: 09babed 11d053b Author: Lewis John McGibbney <[email protected]> AuthorDate: Tue Mar 13 10:05:08 2018 -0700 Merge pull request #8 from Yongyao/SDAP-35 SDAP-35 Overhaul MUDROD configuration .gitignore | 5 + .../mudrod/discoveryengine/MudrodAbstract.java | 2 +- .../discoveryengine/OntologyDiscoveryEngine.java | 8 +- .../mudrod/discoveryengine/RecommendEngine.java | 17 +- .../org/apache/sdap/mudrod/driver/ESDriver.java | 6 + .../mudrod/integration/LinkageIntegration.java | 44 ++- .../apache/sdap/mudrod/main/MudrodConstants.java | 154 ++++++--- .../org/apache/sdap/mudrod/main/MudrodEngine.java | 73 ++-- .../sdap/mudrod/metadata/pre/ApiHarvester.java | 6 +- .../sdap/mudrod/metadata/pre/MatrixGenerator.java | 2 +- .../mudrod/metadata/process/MetadataAnalyzer.java | 13 +- .../sdap/mudrod/metadata/structure/Metadata.java | 51 +++ .../metadata/structure/MetadataExtractor.java | 32 +- .../mudrod/metadata/structure/PODAACMetadata.java | 190 ++++++----- .../sdap/mudrod/ontology/pre/AggregateTriples.java | 5 +- .../mudrod/ontology/process/OntologyLinkCal.java | 18 +- .../mudrod/recommendation/pre/ImportMetadata.java | 9 +- .../recommendation/pre/MetadataTFIDFGenerator.java | 24 +- .../recommendation/pre/NormalizeFeatures.java | 110 ++++++ .../recommendation/pre/NormalizeVariables.java | 223 ------------ .../recommendation/pre/SessionCooccurence.java | 7 +- .../process/AbstractBasedSimilarity.java | 18 +- .../process/FeatureBasedSimilarity.java | 210 ++++++++++++ .../recommendation/process/SessionBasedCF.java | 9 +- .../process/VariableBasedSimilarity.java | 375 --------------------- .../structure/HybridRecommendation.java | 9 +- .../recommendation/structure/MetadataFeature.java | 74 ++++ .../{MetadataOpt.java => MetadataTokenizer.java} | 56 +-- .../structure/PODAACMetadataFeature.java | 359 ++++++++++++++++++++ .../mudrod/recommendation/structure/RecomData.java | 196 ----------- .../sdap/mudrod/ssearch/ClickstreamImporter.java | 2 +- .../org/apache/sdap/mudrod/ssearch/Ranker.java | 13 +- .../sdap/mudrod/ssearch/ranking/Learner.java | 5 +- .../mudrod/ssearch/ranking/TrainingImporter.java | 4 +- .../mudrod/weblog/pre/ClickStreamGenerator.java | 5 +- .../sdap/mudrod/weblog/pre/CrawlerDetection.java | 38 +-- .../sdap/mudrod/weblog/pre/HistoryGenerator.java | 17 +- .../sdap/mudrod/weblog/pre/ImportLogFile.java | 15 +- .../apache/sdap/mudrod/weblog/pre/LogAbstract.java | 10 +- .../sdap/mudrod/weblog/pre/SessionGenerator.java | 10 +- .../sdap/mudrod/weblog/pre/SessionStatistic.java | 37 +- .../mudrod/weblog/process/ClickStreamAnalyzer.java | 11 +- .../mudrod/weblog/process/UserHistoryAnalyzer.java | 2 +- .../mudrod/weblog/structure/ApacheAccessLog.java | 48 ++- .../sdap/mudrod/weblog/structure/FtpLog.java | 10 +- .../sdap/mudrod/weblog/structure/RequestUrl.java | 31 +- .../sdap/mudrod/weblog/structure/Session.java | 7 +- .../mudrod/weblog/structure/SessionExtractor.java | 10 +- .../sdap/mudrod/weblog/structure/SessionNode.java | 8 +- .../sdap/mudrod/weblog/structure/SessionTree.java | 18 +- core/src/main/resources/config.properties | 74 ++++ core/src/main/resources/config.xml | 129 ------- .../recommendation/RecomDatasetsResource.java | 64 ---- .../mudrod/services/DefaultExceptionMapper.java | 0 .../mudrod/services/MudrodContextListener.java | 4 +- .../services/autocomplete/AutoCompleteData.java | 0 .../autocomplete/AutoCompleteResource.java | 0 .../mudrod/services/autocomplete/package-info.java | 0 .../mudrod/services/ontology/OntologyResource.java | 0 .../mudrod/services/ontology/package-info.java | 0 .../apache/sdap}/mudrod/services/package-info.java | 0 .../HybridRecomDatasetsResource.java | 0 .../services/recommendation/package-info.java | 0 .../search/SearchDatasetDetailResource.java | 0 .../services/search/SearchMetadataResource.java | 0 .../services/search/SearchVocabResource.java | 0 .../services/search/SessionDetailResource.java | 0 .../sdap}/mudrod/services/search/package-info.java | 0 service/src/main/webapp/WEB-INF/web.xml | 1 - 69 files changed, 1398 insertions(+), 1480 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
