Changeset 59 for java

Timestamp:

01/30/10 18:34:48 (15 years ago)

Author:

mszubert

Message:

Towards real coevolutionary evaluation.

File:

• java/ecj/framsticks/FramsticksUtils.java (modified) (1 diff)

java/ecj/framsticks/FramsticksUtils.java

@@ -160 +160 @@
         }
 
+        @Deprecated
+        public Pair<? extends InteractionResult> pseudoCoevolutionaryEvaluate(String candidate,
+                        String test, String fileName) {
+                float candidateResult = evaluateGenotype(candidate, fileName);
+                float testResult = evaluateGenotype(test, fileName);
+
+                return new Pair<RealValuedResult>(new RealValuedResult(candidateResult),
+                                new RealValuedResult(testResult));
+        }
+
         public Pair<? extends InteractionResult> coevolutionaryEvaluate(String candidate, String test,
                         String fileName) {
-                float candidateResult = evaluateGenotype(candidate, fileName);
-                float testResult = evaluateGenotype(test, fileName);
+                String fileContents = String.format(GENOTYPE_DESC, candidate) + "\n"
+                                + String.format(GENOTYPE_DESC, test);
+                String filePath = workingDirectory + fileName;
+                saveToFile(filePath, fileContents);
+
+                executeCommand(String.format(EVAL_CMD, executableCommand, experimentDefinition,
+                                settingsFile, filePath));
+                String evaluation = readFromFile(scriptsOutputPath);
+                
+                // TODO: parse output from eval
+                // e.g. candidateResult = Float.parseFloat(evaluation.split("\t")[1]);
+                float candidateResult = 0;
+                float testResult = 0;           
 
                 return new Pair<RealValuedResult>(new RealValuedResult(candidateResult),