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

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.

File:

• trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/AbstractCrossProjectExperiment.java (modified) (4 diffs)

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;