Changeset 121 for trunk/CrossPare/src/de

Timestamp:

06/03/16 15:55:22 (9 years ago)

Author:

sherbold

Message:

• result storage now considers first classifier in file when checking if a result is available

Location:

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

Files:

• eval/IResultStorage.java (modified) (1 diff)
• eval/MySQLResultStorage.java (modified) (1 diff)
• execution/AbstractCrossProjectExperiment.java (modified) (2 diffs)

trunk/CrossPare/src/de/ugoe/cs/cpdp/eval/IResultStorage.java

@@ -43 +43 @@
      * @param productName
      *            name of the product
+     * @param classifierName
+     *            name of the first classifier in the configuration
      * @return number of contained resultsfor the given product and experiment
      */
-    public int containsResult(String experimentName, String productName);
+    public int containsResult(String experimentName, String productName, String classifierName);
 }

trunk/CrossPare/src/de/ugoe/cs/cpdp/eval/MySQLResultStorage.java

@@ -162 +162 @@
      */
     @Override
-    public int containsResult(String experimentName, String productName) {
+    public int containsResult(String experimentName, String productName, String classifierName) {
         String sql = "SELECT COUNT(*) as cnt FROM crosspare.results WHERE configurationName=\'" +
-            experimentName + "\' AND productName=\'" + productName + "\';";
+            experimentName + "\' AND productName=\'" + productName + "\' AND classifier=\'" + classifierName + "\';";
         Statement stmt;
         try {

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

@@ -36 +36 @@
 import de.ugoe.cs.cpdp.training.ITrainer;
 import de.ugoe.cs.cpdp.training.ITrainingStrategy;
+import de.ugoe.cs.cpdp.training.IWekaCompatibleTrainer;
 import de.ugoe.cs.cpdp.versions.IVersionFilter;
 import de.ugoe.cs.cpdp.versions.SoftwareVersion;
@@ -350 +351 @@
             return 0;
         }
+        
+        List<ITrainer> allTrainers = new LinkedList<>();
+        for (ISetWiseTrainingStrategy setwiseTrainer : config.getSetWiseTrainers()) {
+            allTrainers.add(setwiseTrainer);
+        }
+        for (ISetWiseTestdataAwareTrainingStrategy setwiseTestdataAwareTrainer : config
+            .getSetWiseTestdataAwareTrainers())
+        {
+            allTrainers.add(setwiseTestdataAwareTrainer);
+        }
+        for (ITrainingStrategy trainer : config.getTrainers()) {
+            allTrainers.add(trainer);
+        }
+        for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) {
+            allTrainers.add(trainer);
+        }
+        
         int available = Integer.MAX_VALUE;
         for (IResultStorage storage : config.getResultStorages()) {
-            int curAvailable = storage.containsResult(config.getExperimentName(), version.getVersion());
+            String classifierName = ((IWekaCompatibleTrainer) allTrainers.get(0)).getName();
+            int curAvailable = storage.containsResult(config.getExperimentName(), version.getVersion(), classifierName);
             if( curAvailable<available ) {
                 available = curAvailable;