Changeset 6326

Timestamp:

05/28/11 00:04:03 (13 years ago)

Author:

bfarka

Message:

added ecj and custom statistics to communicate with the okb services #1441

Location:

branches/OKBJavaConnector/ECJClient/src

Files:

• com/heuristiclab/okb/ecj/OKBStatistics.java (modified) (3 diffs)
• tutorial1.params (modified) (1 diff)

branches/OKBJavaConnector/ECJClient/src/com/heuristiclab/okb/ecj/OKBStatistics.java

@@ -10 +10 @@
 import com.heuristiclab.okb.service.administration.Platform;
 
+import java.util.Map;
 
 import ec.EvolutionState;
 import ec.Statistics;
 import ec.util.Parameter;
-import ec.util.ParameterDatabase;
+
+import java.beans.XMLEncoder;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
 
 /**
@@ -22 +26 @@
 public class OKBStatistics extends Statistics{
 
-    public static final String ECJ_PLATFORM_NAME = "Unknown";
+    public static final String ECJ_PLATFORM_NAME = "ECJ";
+    public static final String OKB_PARAMETER_NAME = "okb.parameter";
+    public static final String OKB_PARAMETER_SEED = "okb.parameter.seed";
     private Platform ecjPlatform;
-    private Algorithm algorithm;
+    
 
 
@@ -40 +46 @@
     public void postInitializationStatistics(EvolutionState state) {
         super.postInitializationStatistics(state);
+    }
 
-            ecjPlatform = AdministrationServiceUtil.getPlattform(ECJ_PLATFORM_NAME);
-        algorithm = RunCreationUtil.getAlgorithm(state.evaluator.getClass().getName(), ecjPlatform.getName());
-        Object o = state.parameters;
-        while(state.parameters.elements().hasMoreElements())
-            System.out.print(state.parameters.elements().nextElement());
-        
-        ;
-        state.parameters.getProperty("state.parameters.entrySet()");
-        state.parameters.getString(new Parameter("print-params"),new Parameter(""));
-        
+    @Override
+    public void finalStatistics(EvolutionState state, int result) {
+        super.finalStatistics(state, result);
+
+       ecjPlatform = AdministrationServiceUtil.getPlattform(ECJ_PLATFORM_NAME);
+       Algorithm algorithm = RunCreationUtil.getAlgorithm(state.evaluator.getClass().getName(), ecjPlatform.getName());
+       Map<String, String> parameters = getParametersToSend(state);
+       ByteArrayOutputStream o = new ByteArrayOutputStream();
+       new XMLEncoder(o).writeObject(state);
 
 
+        
+        RunCreationUtil.createRun(parameters,result,new String(o.toByteArray()),getSeed(state),algorithm.getId() , ecjPlatform.getId());
+
+    }
+
+    private int getSeed(EvolutionState state)
+    {
+        int returnValue = 0;
+        String seedName = state.parameters.getString(new Parameter(OKB_PARAMETER_SEED),null);
+        if(seedName == null)
+            throw new IllegalArgumentException("no seed given!");
+
+        returnValue = state.parameters.getInt(new Parameter(seedName),null);
+
+        return returnValue;
+    }
+
+
+    private Map<String, String> getParametersToSend(EvolutionState state)
+    {
+        Map<String, String> returnValue = new HashMap<String, String>();
+        for(String name : state.parameters.getString(new Parameter(OKB_PARAMETER_NAME),null).split(";"))
+        {
+            String tmp = state.parameters.getString(new Parameter(name.trim()),null);
+            if(tmp == null)
+                returnValue.put(name, name);
+            else
+                returnValue.put(name, tmp);
+
+        }
+
+        return returnValue;
     }
     
     
     
-    
-    
 }

branches/OKBJavaConnector/ECJClient/src/tutorial1.params

@@ -52 +52 @@
 print-all-params = true
 eval.problem    = ec.app.tutorial1.MaxOnes
+
+
+okb.parameter = pop.subpop.0.size; pop.subpop.0.duplicate-retrie
+okb.parameter.seed = seed.0