Changeset 69

Timestamp:

05/03/16 15:17:36 (9 years ago)

Author:

sherbold

Message:

• updated new result storage concept and cross-project experiments to first check if a result is available. If this is the case, the experiment is not executed.

Location:

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

Files:

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

trunk/CrossPare/src/de/ugoe/cs/cpdp/Runner.java

@@ -45 +45 @@
     public static void main(String[] args) {
         new TextConsole(Level.FINE);
-        final int concurrentThreads = Runtime.getRuntime().availableProcessors() - 2;
+        final int concurrentThreads = Runtime.getRuntime().availableProcessors();
         final ExecutorService threadPool = Executors.newFixedThreadPool(concurrentThreads);
         for (String arg : args) {
@@ -89 +89 @@
 
         if (config != null) {
-            Console.trace(Level.FINE, config.toString());
+            Console.trace(Level.FINEST, config.toString());
             // Instantiate the class like it was given as parameter in the config file and cast it
             // to the interface

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

@@ -4 +4 @@
 
     public void addResult(ExperimentResult result);
+    
+    public boolean containsResult(String experimentName, String productName);
 }

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

@@ -4 +4 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -34 +35 @@
 
     public void addResult(ExperimentResult result) {
-        Statement stmt;
-        try {
-            stmt = con.createStatement();
-        }
-        catch (SQLException e) {
-            Console.printerr("Problem with MySQL connection: ");
-            Console.printerr("SQLException: " + e.getMessage());
-            Console.printerr("SQLState: " + e.getSQLState());
-            Console.printerr("VendorError: " + e.getErrorCode());
-            return;
-        }
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO crosspare.results VALUES (NULL,");
@@ -72 +62 @@
         sql.append(result.getTn()+",");
         sql.append(result.getFp()+");");
+        
+        Statement stmt;
         try {
+            stmt = con.createStatement();
             stmt.executeUpdate(sql.toString().replace("NaN", "NULL"));
         }
@@ -84 +77 @@
     }
     
-    //public boolean containsResult(String configurationName, String productName, String classifier);
+    @Override
+    public boolean containsResult(String experimentName, String productName) {
+        String sql = "SELECT COUNT(*) as cnt FROM crosspare.results WHERE configurationName=\'" + experimentName + "\' AND productName=\'" + productName + "\';";
+        Statement stmt;
+        boolean contained = false;
+        try {
+            stmt = con.createStatement();
+            ResultSet results = stmt.executeQuery(sql);
+            results.next();
+            int count = results.getInt("cnt");
+            contained = count>0;
+        }
+        catch (SQLException e) {
+            Console.printerr("Problem with MySQL connection: \n");
+            Console.printerr("SQLException: " + e.getMessage() + "\n");
+            Console.printerr("SQLState: " + e.getSQLState() + "\n");
+            Console.printerr("VendorError: " + e.getErrorCode() + "\n");
+        }
+        return contained;
+    }
 }

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

@@ -29 +29 @@
 import de.ugoe.cs.cpdp.dataselection.ISetWiseDataselectionStrategy;
 import de.ugoe.cs.cpdp.eval.IEvaluationStrategy;
+import de.ugoe.cs.cpdp.eval.IResultStorage;
 import de.ugoe.cs.cpdp.loader.IVersionLoader;
 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy;
@@ -163 +164 @@
                                               config.getExperimentName(), versionCount,
                                               testVersionCount, testVersion.getVersion()));
+                if (resultsAvailable(testVersion)) {
+                    Console.traceln(Level.INFO,
+                                    String.format(
+                                                  "[%s] [%02d/%02d] %s: results already available; skipped",
+                                                  config.getExperimentName(), versionCount,
+                                                  testVersionCount, testVersion.getVersion()));
+                    versionCount++;
+                    continue;
+                }
 
                 // Setup testdata and training data
@@ -299 +309 @@
                             config.getExperimentName() + ".csv");
                     }
-                    evaluator.apply(testdata, traindata, allTrainers, writeHeader, config.getResultStorages());
+                    evaluator.apply(testdata, traindata, allTrainers, writeHeader,
+                                    config.getResultStorages());
                     writeHeader = false;
                 }
@@ -327 +338 @@
         return result;
     }
+
+    private boolean resultsAvailable(SoftwareVersion version) {
+        if (config.getResultStorages().isEmpty()) {
+            return false;
+        }
+        boolean available = true;
+        for (IResultStorage storage : config.getResultStorages()) {
+            available &= storage.containsResult(config.getExperimentName(), version.getVersion());
+        }
+        return available;
+    }
 }