Changeset 98 for trunk/CrossPare/src/de/ugoe/cs/cpdp

Timestamp:

05/13/16 09:18:15 (9 years ago)

Author:

sherbold

Message:

• added the new configuration parameter repetitions and implemented its usage in the AbstractCrossProjectExperiment?. It now allows for multiple storages of the same result in an IResultContainer to allow for repetitions of experiments with random components.

Location:

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

Files:

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

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

@@ -161 +161 @@
      */
     private Boolean saveClassifier = null;
+    
+    /**
+     * number of repetitions of an experiment (to account for randomness)
+     */
+    private int repetitions = 1;
 
     /**
@@ -421 +426 @@
         return saveClassifier;
     }
+    
+    /**
+     * number of repetitions of an experiment
+     *
+     * @return number of repetitions
+     */
+    public int getRepetitions() {
+        return repetitions;
+    }
 
     /**
@@ -564 +578 @@
             else if (qName.equals("saveClassifier")) {
                 saveClassifier = true;
+            }
+            else if( qName.equals("repetitions")) {
+                repetitions = Integer.parseInt(attributes.getValue("number"));
             }
             else if (qName.equals("executionStrategy")) {

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

@@ -43 +43 @@
      * @param productName
      *            name of the product
-     * @return true of the results ofr the given product and experiment are contained in the result
-     *         storage
+     * @return number of contained resultsfor the given product and experiment
      */
-    public boolean containsResult(String experimentName, String productName);
+    public int containsResult(String experimentName, String productName);
 }

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

@@ -162 +162 @@
      */
     @Override
-    public boolean containsResult(String experimentName, String productName) {
+    public int 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 = connectionPool.getConnection().createStatement();
             ResultSet results = stmt.executeQuery(sql);
             results.next();
-            int count = results.getInt("cnt");
-            contained = count > 0;
+            return results.getInt("cnt");
         }
         catch (SQLException e) {
@@ -179 +177 @@
             Console.printerr("SQLState: " + e.getSQLState() + "\n");
             Console.printerr("VendorError: " + e.getErrorCode() + "\n");
-            Console.printerr("\nskipping product since we could not check if the results is available");
-            contained = true;
+            return 0;
         }
-        return contained;
     }
 }

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

@@ -148 +148 @@
         int versionCount = 1;
         int testVersionCount = 0;
+        int numTrainers = 0;
 
         for (SoftwareVersion testVersion : versions) {
@@ -154 +155 @@
             }
         }
+        
+        numTrainers += config.getSetWiseTrainers().size();
+        numTrainers += config.getSetWiseTestdataAwareTrainers().size();
+        numTrainers += config.getTrainers().size();
+        numTrainers += config.getTestAwareTrainers().size();
 
         // sort versions
@@ -164 +170 @@
                                               config.getExperimentName(), versionCount,
                                               testVersionCount, testVersion.getVersion()));
-                if (resultsAvailable(testVersion)) {
+                int numResultsAvailable = resultsAvailable(testVersion);
+                if (numResultsAvailable >= numTrainers*config.getRepetitions()) {
                     Console.traceln(Level.INFO,
                                     String.format(
@@ -339 +346 @@
     }
 
-    private boolean resultsAvailable(SoftwareVersion version) {
+    private int resultsAvailable(SoftwareVersion version) {
         if (config.getResultStorages().isEmpty()) {
-            return false;
-        }
-        boolean available = true;
+            return 0;
+        }
+        int available = Integer.MAX_VALUE;
         for (IResultStorage storage : config.getResultStorages()) {
-            available &= storage.containsResult(config.getExperimentName(), version.getVersion());
+            int curAvailable = storage.containsResult(config.getExperimentName(), version.getVersion());
+            if( curAvailable<available ) {
+                available = curAvailable;
+            }
         }
         return available;