Changeset 44 for trunk/CrossPare/src/de/ugoe/cs/cpdp/execution

Timestamp:

11/17/15 20:42:08 (9 years ago)

Author:

atrautsch

Message:

metric matching hinzu

Location:

trunk/CrossPare/src/de/ugoe/cs/cpdp/execution

Files:

• CrossProjectExperiment.java (modified) (3 diffs)
• RelaxedCrossProjectExperiment.java (modified) (2 diffs)

trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/CrossProjectExperiment.java

@@ -31 +31 @@
 import de.ugoe.cs.cpdp.eval.IEvaluationStrategy;
 import de.ugoe.cs.cpdp.loader.IVersionLoader;
+import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ITrainer;
@@ -168 +169 @@
                     setwiseTrainer.apply(traindataSet);
                 }
+                for (ISetWiseTestdataAwareTrainingStrategy setwiseTestdataAwareTrainer : config.getSetWiseTestdataAwareTrainers()) {
+                    Console.traceln(Level.FINE, String
+                        .format("[%s] [%02d/%02d] %s: applying testdata aware setwise trainer %s",
+                                config.getExperimentName(), versionCount, testVersionCount,
+                                testVersion.getVersion(), setwiseTestdataAwareTrainer.getName()));
+                    setwiseTestdataAwareTrainer.apply(traindataSet, testdata);
+                }
                 Instances traindata = makeSingleTrainingSet(traindataSet);
                 for (IProcessesingStrategy processor : config.getPreProcessors()) {
@@ -210 +218 @@
                     for (ISetWiseTrainingStrategy setwiseTrainer : config.getSetWiseTrainers()) {
                         allTrainers.add(setwiseTrainer);
+                    }
+                    for (ISetWiseTestdataAwareTrainingStrategy setwiseTestdataAwareTrainer : config.getSetWiseTestdataAwareTrainers()) {
+                        allTrainers.add(setwiseTestdataAwareTrainer);
                     }
                     for (ITrainingStrategy trainer : config.getTrainers()) {

trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/RelaxedCrossProjectExperiment.java

@@ -31 +31 @@
 import de.ugoe.cs.cpdp.eval.IEvaluationStrategy;
 import de.ugoe.cs.cpdp.loader.IVersionLoader;
+import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ITrainer;
@@ -173 +174 @@
                     setwiseTrainer.apply(traindataSet);
                 }
+                for (ISetWiseTestdataAwareTrainingStrategy setwiseTestdataAwareTrainer : config.getSetWiseTestdataAwareTrainers()) {
+                    Console.traceln(Level.FINE, String
+                        .format("[%s] [%02d/%02d] %s: applying testdata aware setwise trainer %s",
+                                config.getExperimentName(), versionCount, testVersionCount,
+                                testVersion.getVersion(), setwiseTestdataAwareTrainer.getName()));
+                    setwiseTestdataAwareTrainer.apply(traindataSet, testdata);
+                }
                 Instances traindata = makeSingleTrainingSet(traindataSet);
                 for (IProcessesingStrategy processor : config.getPreProcessors()) {