Changeset 5255

Timestamp:

01/08/11 14:34:26 (14 years ago)

Author:

mholper

Message:

added createmissingProblemParams Method #1218

Location:

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb

Files:

• impl/ECJ19ConnectorImpl.java (modified) (1 diff)
• wsclient/OKBServiceClient.java (modified) (6 diffs)

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/impl/ECJ19ConnectorImpl.java

@@ -56 +56 @@
     // TODO Auto-generated method stub
     
-    Set<String> missingParamSet = algoParams.keySet();
-    missingParamSet.removeAll(okbClient.getAlgorithmParameterMap(state.getAlgorithmId()).keySet());
+    Set<String> missingAlgoParamSet = algoParams.keySet();
+    missingAlgoParamSet.removeAll(okbClient.getAlgorithmParameterMap(state.getAlgorithmId()).keySet());
     
     //fehlende Param Anlegen
+    if (missingAlgoParamSet.size()>0)
+      okbClient.createMissingAlgoParams(state.getAlgorithmId(), missingAlgoParamSet);   
     
-    okbClient.createMissingAlgoParams(state.getAlgorithmId(), missingParamSet);   
+    Set<String> missingProblemParamSet = problemParams.keySet();
+    missingProblemParamSet.removeAll(okbClient.getProblemParameterMap(state.getProblemId()).keySet());    
 
     //create Experiment if algoparams not exists in HL and problemparams not exits (in HL)

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/wsclient/OKBServiceClient.java

@@ -3 +3 @@
 import static at.hl.okb.wsclient.Utilities.createNameFilter;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import javax.xml.bind.JAXBElement;
 
 import at.hl.wsclient.okb.Algorithm;
@@ -17 +13 @@
 import at.hl.wsclient.okb.AlgorithmParameter;
 import at.hl.wsclient.okb.ArrayOfAlgorithmParameter;
+import at.hl.wsclient.okb.ArrayOfProblemParameter;
 import at.hl.wsclient.okb.IOKBService;
 import at.hl.wsclient.okb.NamedOKBItem;
@@ -24 +21 @@
 import at.hl.wsclient.okb.Problem;
 import at.hl.wsclient.okb.ProblemClass;
+import at.hl.wsclient.okb.ProblemData;
+import at.hl.wsclient.okb.ProblemParameter;
 
 import com.google.common.collect.Iterables;
@@ -109 +108 @@
     Map<String, Object> returnMap = new HashMap<String, Object>();
 
-    AlgorithmData algoData = port.getAlgorithmData(algorithmId);
-
     ArrayOfAlgorithmParameter algoParamList = port
         .getAlgorithmParameters(algorithmId);
@@ -117 +114 @@
         .getAlgorithmParameter()) {
       returnMap.put(algoParam.getName().getValue(), null);
-      // port.getDataType(algoParam.getDataTypeId()).getName().getValue());
     }
 
     return returnMap;
   }
+  
+  public Map<String, Object> getProblemParameterMap(Long ProblemId) {
+    Map<String, Object> returnMap = new HashMap<String, Object>();
+
+    ArrayOfProblemParameter algoParamList = port
+        .getProblemParameters(ProblemId);
+
+    for (ProblemParameter algoParam : algoParamList
+        .getProblemParameter()) {
+      returnMap.put(algoParam.getName().getValue(), null);
+    }
+
+    return returnMap;
+  } 
+  
+
 
   private <T extends NamedOKBItem> T createNamedOKBItem(Class<T> clazz,
@@ -160 +172 @@
     }
   }
+  
+  public void createMissingProblemParams(Long ProblemId,
+      Set<String> missingParamNames) {
+
+    //falls Werte auch verglichen werdne sollen
+    //Map<String, Object> ecjProblemParams
+    //Set<String> missingParamNames = ecjProblemParams.keySet();
+    for (String paramname : missingParamNames) {
+      ProblemParameter newProblemParam = new ProblemParameter();
+      newProblemParam.setProblemId(ProblemId);
+      newProblemParam.setDataTypeId(null);// TODO insert DatatypeId if not
+                        // exists (mapping first);
+      newProblemParam.setDescription(factory
+          .createNamedOKBItemDescription("created from ECJ"));
+      newProblemParam.setName(factory
+          .createNamedOKBItemDescription(paramname));
+      port.addProblemParameter(newProblemParam);
+    }
+  } 
 }