Changeset 80 for trunk


Ignore:
Timestamp:
05/06/16 15:55:40 (9 years ago)
Author:
sherbold
Message:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/CrossPareConfigurationBuilder/src/de/ugoe/cs/crosspare/ConfigurationBuilder.java

    r60 r80  
    2323            writeFile("Peters2012", dataset); 
    2424            writeFile("Uchigaki2012", dataset); 
    25             // TODO Canfora 2013 (MODEP) 
     25            writeFile("Canfora2013", dataset); 
    2626            writeFile("Peters2013", dataset); 
    2727            writeFile("Herbold2013", dataset); 
    … …  
    3131            // TODO F.Zhang 2014 
    3232            // TODO Mizuno 2014: data not public 
    33             // TODO Ryu 2014 
     33            writeFile("Ryu2014", dataset); 
    3434            writeFile("PHe2015", dataset); 
    3535            // TODO Peters 2015 (LACE2) 
    36             // TODO Chen 2015 
    3736            writeFile("Kawata2015", dataset); 
    3837            writeFile("YZhang2015", dataset); 
    3938            writeFile("Amasaki2015", dataset); 
    40             // TODO Ryu 2015a 
    4139            writeFile("Ryu2015b", dataset); 
    4240            // TODO Cao 2015 implementation details missing 
    4341            writeFile("Nam2015b", dataset); 
    44             // TODO test 
    4542        } 
    4643    } 
    … …  
    6663     
    6764    public static void postamble(StringBuilder configFile) { 
     65        configFile.append(" <storage name=\"MySQLResultStorage\" param=\"\" />\n"); 
    6866        configFile.append("</config>"); 
    6967    } 
    … …  
    7371        configFile.append(" <trainer name=\"WekaTraining\" param=\"C4.5-DTree weka.classifiers.trees.J48 -CVPARAM C 0.1 0.3 5\" />\n"); 
    7472        configFile.append(" <trainer name=\"WekaTraining\" param=\"Logistic weka.classifiers.functions.Logistic\" />\n"); 
    75         configFile.append(" <trainer name=\"WekaTraining\" param=\"NeuralNetwork weka.classifiers.functions.MultilayerPerceptron -CVPARAM M 1.5 2.5 3.0 L 0.2 0.4 3.0\" />\n"); 
    7673        configFile.append(" <trainer name=\"WekaTraining\" param=\"RBFNetwork weka.classifiers.functions.RBFNetwork -CVPARAM W 0.1 10.0 3.0 L 2.0 18.0 3.0\" />\n"); 
    7774        configFile.append(" <trainer name=\"WekaTraining\" param=\"SMORBF weka.classifiers.functions.SMO -K weka.classifiers.functions.supportVector.RBFKernel\" />\n"); 
    … …  
    8279        configFile.append(" <setwisetrainer name=\"WekaBaggingTraining\" param=\"BaggingC4.5-DTree weka.classifiers.trees.J48 -CVPARAM C 0.1 0.3 5\" />\n"); 
    8380        configFile.append(" <setwisetrainer name=\"WekaBaggingTraining\" param=\"BaggingLogistic weka.classifiers.functions.Logistic\" />\n"); 
    84         configFile.append(" <setwisetrainer name=\"WekaBaggingTraining\" param=\"BaggingNeuralNetwork weka.classifiers.functions.MultilayerPerceptron -CVPARAM M 1.5 2.5 3.0 L 0.2 0.4 3.0\" />\n"); 
    8581        configFile.append(" <setwisetrainer name=\"WekaBaggingTraining\" param=\"BaggingRBFNetwork weka.classifiers.functions.RBFNetwork -CVPARAM W 0.1 10.0 3.0 L 2.0 18.0 3.0\" />\n"); 
    8682        configFile.append(" <setwisetrainer name=\"WekaBaggingTraining\" param=\"BaggingSMORBF weka.classifiers.functions.SMO -K weka.classifiers.functions.supportVector.RBFKernel\" />\n"); 
    … …  
    9187        configFile.append(" <trainer name=\"WekaLocalFQTraining\" param=\"LocalC4.5-DTree weka.classifiers.trees.J48 -CVPARAM C 0.1 0.3 5\" />\n"); 
    9288        configFile.append(" <trainer name=\"WekaLocalFQTraining\" param=\"LocalLogistic weka.classifiers.functions.Logistic\" />\n"); 
    93         configFile.append(" <trainer name=\"WekaLocalFQTraining\" param=\"LocalNeuralNetwork weka.classifiers.functions.MultilayerPerceptron -CVPARAM M 1.5 2.5 3.0 L 0.2 0.4 3.0\" />\n"); 
    9489        configFile.append(" <trainer name=\"WekaLocalFQTraining\" param=\"LocalRBFNetwork weka.classifiers.functions.RBFNetwork -CVPARAM W 0.1 10.0 3.0 L 2.0 18.0 3.0\" />\n"); 
    9590        configFile.append(" <trainer name=\"WekaLocalFQTraining\" param=\"LocalSMORBF weka.classifiers.functions.SMO -K weka.classifiers.functions.supportVector.RBFKernel\" />\n"); 
    … …  
    10095        configFile.append(" <trainer name=\"WekaLASERTraining\" param=\"LASERC4.5-DTree weka.classifiers.trees.J48 -CVPARAM C 0.1 0.3 5\" />\n"); 
    10196        configFile.append(" <trainer name=\"WekaLASERTraining\" param=\"LASERLogistic weka.classifiers.functions.Logistic\" />\n"); 
    102         configFile.append(" <trainer name=\"WekaLASERTraining\" param=\"LASERNeuralNetwork weka.classifiers.functions.MultilayerPerceptron -CVPARAM M 1.5 2.5 3.0 L 0.2 0.4 3.0\" />\n"); 
    10397        configFile.append(" <trainer name=\"WekaLASERTraining\" param=\"LASERRBFNetwork weka.classifiers.functions.RBFNetwork -CVPARAM W 0.1 10.0 3.0 L 2.0 18.0 3.0\" />\n"); 
    10498        configFile.append(" <trainer name=\"WekaLASERTraining\" param=\"LASERSMORBF weka.classifiers.functions.SMO -K weka.classifiers.functions.supportVector.RBFKernel\" />\n"); 
    … …  
    109103        { 
    110104            case MDP: 
    111                 configFile.append(" <loader name=\"NasaARFFFolderLoader\" datalocation=\"exp-mdp/data\" relative=\"false\"/>\n"); 
    112                 configFile.append(" <resultsPath path=\"exp-mdp/results\"/>\n"); 
     105                configFile.append(" <loader name=\"NasaARFFFolderLoader\" datalocation=\"benchmark/data/MDP\" relative=\"false\"/>\n"); 
     106                configFile.append(" <resultspath path=\"benchmark/results-csv\"/>\n"); 
    113107                break; 
    114108            case JURECZKO: 
    115                 configFile.append(" <loader name=\"CSVFolderLoader\" datalocation=\"exp-java/data\" relative=\"false\"/>\n"); 
    116                 configFile.append(" <resultsPath path=\"exp-java/results\"/>\n"); 
     109                configFile.append(" <loader name=\"CSVFolderLoader\" datalocation=\"benchmark/data/JURECZKO\" relative=\"false\"/>\n"); 
     110                configFile.append(" <resultspath path=\"benchmark/results-csv\"/>\n"); 
    117111                break; 
    118112            default: 
    … …  
    219213        dataset(configFile, dataset); 
    220214         
    221         configFile.append(" <preprocessor name=\"ZScoreNormalization\" param=\"\" />"); 
     215        configFile.append(" <preprocessor name=\"ZScoreNormalization\" param=\"\" />\n"); 
    222216        configFile.append(" <trainer name=\"WekaTraining\" param=\"LogisticEnsemble de.ugoe.cs.cpdp.wekaclassifier.LogisticEnsemble\" />\n"); 
    223217        configFile.append(" <eval name=\"NormalWekaEvaluation\" param=\"\" />\n"); 
    … …  
    227221    } 
    228222     
    229     // TODO Canfora 2013 (MODEP) 
     223    public static String Canfora2013(Dataset dataset) { 
     224        StringBuilder configFile = new StringBuilder(); 
     225        preamble(configFile); 
     226        dataset(configFile, dataset); 
     227         
     228        configFile.append(" <preprocessor name=\"ZScoreNormalization\" param=\"\" />\n"); 
     229        configFile.append(" <trainer name=\"WekaTraining\" param=\"MODEP de.ugoe.cs.cpdp.wekaclassifier.MODEPClassifier -R 0.7\" />\n"); 
     230        configFile.append(" <eval name=\"NormalWekaEvaluation\" param=\"\" />\n"); 
     231         
     232        postamble(configFile); 
     233        return configFile.toString(); 
     234    } 
    230235     
    231236    public static String Peters2013(Dataset dataset) { 
    … …  
    304309    // TODO Mizuno 2014: data not public 
    305310     
    306     // TODO Ryu 2014 
     311    public static String Ryu2014(Dataset dataset) { 
     312        StringBuilder configFile = new StringBuilder(); 
     313        preamble(configFile); 
     314        dataset(configFile, dataset); 
     315         
     316        configFile.append(" <preprocessor name=\"ZScoreNormalization\" param=\"\" />\n"); 
     317        configFile.append(" <testawaretrainer name=\"WekaTestAwareTraining\" param=\"VCBSVM de.ugoe.cs.cpdp.wekaclassifier.VCBSVM -L 0.1 -B 10\" />\n"); 
     318        configFile.append(" <eval name=\"NormalWekaEvaluation\" param=\"\" />\n"); 
     319         
     320        postamble(configFile); 
     321        return configFile.toString(); 
     322    } 
    307323     
    308324    public static String PHe2015(Dataset dataset) { 
    … …  
    321337     
    322338    // TODO Peters 2015 (LACE2) 
    323      
    324     // TODO Chen 2015 
    325339     
    326340    public static String Kawata2015(Dataset dataset) { 
    … …  
    369383    } 
    370384     
    371     // TODO Amasaki 2015 
    372      
    373     // TODO Ryu 2015a 
    374      
    375385    public static String Ryu2015b(Dataset dataset) { 
    376386        StringBuilder configFile = new StringBuilder(); 
Note: See TracChangeset for help on using the changeset viewer.