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

Timestamp:

04/29/16 14:29:52 (9 years ago)

Author:

sherbold

Message:

• added new interface ITestAwareTraining strategy to the framework to support trainers with knowledge of the test data. The implementation of such trainers must take care to not accidentally take the classification of the test data into account.

Location:

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

Files:

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

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

@@ -33 +33 @@
 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy;
+import de.ugoe.cs.cpdp.training.ITestAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ITrainer;
 import de.ugoe.cs.cpdp.training.ITrainingStrategy;
@@ -206 +207 @@
                     trainer.apply(traindata);
                 }
+                for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) {
+                    Console.traceln(Level.FINE, String
+                        .format("[%s] [%02d/%02d] %s: applying trainer %s",
+                                config.getExperimentName(), versionCount, testVersionCount,
+                                testVersion.getVersion(), trainer.getName()));
+                    trainer.apply(testdata, traindata);
+                }
                 File resultsDir = new File(config.getResultsPath());
                 if (!resultsDir.exists()) {
@@ -223 +231 @@
                     }
                     for (ITrainingStrategy trainer : config.getTrainers()) {
+                        allTrainers.add(trainer);
+                    }
+                    for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) {
                         allTrainers.add(trainer);
                     }

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

@@ -33 +33 @@
 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy;
+import de.ugoe.cs.cpdp.training.ITestAwareTrainingStrategy;
 import de.ugoe.cs.cpdp.training.ITrainer;
 import de.ugoe.cs.cpdp.training.ITrainingStrategy;
@@ -211 +212 @@
                     trainer.apply(traindata);
                 }
+                for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) {
+                    Console.traceln(Level.FINE, String
+                        .format("[%s] [%02d/%02d] %s: applying trainer %s",
+                                config.getExperimentName(), versionCount, testVersionCount,
+                                testVersion.getVersion(), trainer.getName()));
+                    trainer.apply(testdata, traindata);
+                }
                 File resultsDir = new File(config.getResultsPath());
                 if (!resultsDir.exists()) {
@@ -224 +232 @@
                         allTrainers.add(setwiseTrainer);
                     }
+                    for (ISetWiseTestdataAwareTrainingStrategy setwiseTrainer : config.getSetWiseTestdataAwareTrainers()) {
+                        allTrainers.add(setwiseTrainer);
+                    }
                     for (ITrainingStrategy trainer : config.getTrainers()) {
+                        allTrainers.add(trainer);
+                    }
+                    for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) {
                         allTrainers.add(trainer);
                     }