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 09babed4b19ad874028b27ac6c21f6b97b712a7b
Merge: 38b8277 0a6b88f
Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com>
AuthorDate: Tue Mar 6 19:14:04 2018 -0800

    Merge pull request #5 from lewismc/SDAP-18
    
    SDAP-18 Review code contribition from Sigee

 .../mudrod/discoveryengine/RecommendEngine.java    |   4 +-
 .../discoveryengine/WeblogDiscoveryEngine.java     |  16 +--
 .../org/apache/sdap/mudrod/driver/ESDriver.java    |   9 +-
 .../org/apache/sdap/mudrod/driver/SparkDriver.java |  32 ------
 .../org/apache/sdap/mudrod/main/MudrodEngine.java  |   3 +-
 .../sdap/mudrod/metadata/pre/ApiHarvester.java     |   2 +-
 .../mudrod/metadata/structure/PODAACMetadata.java  |   6 +-
 .../sdap/mudrod/ontology/pre/AggregateTriples.java |  12 +--
 .../mudrod/ontology/process/LocalOntology.java     |  10 +-
 .../sdap/mudrod/ontology/process/OwlParser.java    |   1 -
 .../recommendation/pre/NormalizeVariables.java     |   4 +-
 .../recommendation/pre/SessionCooccurence.java     |   4 +-
 .../{sessionBasedCF.java => SessionBasedCF.java}   |   8 +-
 .../process/VariableBasedSimilarity.java           |  27 ++---
 .../structure/HybridRecommendation.java            |   5 +-
 .../recommendation/structure/MetadataOpt.java      |   4 +-
 .../mudrod/recommendation/structure/RecomData.java |   7 +-
 .../org/apache/sdap/mudrod/ssearch/Searcher.java   |  21 ++--
 .../sdap/mudrod/ssearch/ranking/DataGenerator.java |  25 ++---
 .../sdap/mudrod/ssearch/ranking/Evaluator.java     |  65 ++++++------
 .../sdap/mudrod/ssearch/structure/SResult.java     |  12 +--
 .../apache/sdap/mudrod/utils/LinkageTriple.java    |  23 ++---
 .../org/apache/sdap/mudrod/utils/MatrixUtil.java   |  10 +-
 .../weblog/partition/KGreedyPartitionSolver.java   |  70 +++++--------
 .../sdap/mudrod/weblog/pre/HistoryGenerator.java   |   6 +-
 .../sdap/mudrod/weblog/pre/ImportLogFile.java      |   4 +-
 .../apache/sdap/mudrod/weblog/pre/LogAbstract.java |  10 +-
 .../sdap/mudrod/weblog/pre/SessionGenerator.java   |   1 -
 .../sdap/mudrod/weblog/pre/SessionStatistic.java   | 113 +++++++++++++--------
 .../mudrod/weblog/structure/ApacheAccessLog.java   |  73 +++++++------
 .../sdap/mudrod/weblog/structure/Session.java      |   2 +-
 .../mudrod/weblog/structure/SessionExtractor.java  |  37 +++----
 .../sdap/mudrod/weblog/structure/SessionTree.java  |  50 +++++----
 .../HybridRecomDatasetsResource.java               |   6 +-
 .../recommendation/RecomDatasetsResource.java      |   9 +-
 web/META-INF/resources/css/index.css               |  12 +--
 36 files changed, 314 insertions(+), 389 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
lewi...@apache.org.

Reply via email to