Changeset 17266 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCInstantiator.cs

Timestamp:

09/20/19 16:23:42 (5 years ago)

Author:

dpiringe

Message:

#3026:

• changed the namespace from ParameterTest to HeuristicLab.Manufacture
• added an extension method for Type to get the distance of an interface based on the target type
• renamed methods ToData, SetValue to Extract, Inject
• new implementation of the template generation with transformers (not the final name)
• started to use the new transformers for the instantiation of IOptimizer-objects (out of a template)
• new transformers: LookupParameterTransformer and DummyTransformer

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCInstantiator.cs (modified) (4 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCInstantiator.cs

@@ -12 +12 @@
 using Newtonsoft.Json.Linq;
 
-namespace ParameterTest {
+namespace HeuristicLab.Manufacture {
 
   
@@ -28 +28 @@
 
     public IAlgorithm Instantiate(string configFile) {
-      JObject config = JObject.Parse(File.ReadAllText(configFile));
+      JArray config = JArray.Parse(File.ReadAllText(configFile));
+      JCObject obj = config[0].ToObject<JCObject>();
+      IAlgorithm algorithm = CreateObject<IAlgorithm>(obj);
 
+      foreach(var sp in obj.StaticParameters) {
+        if(algorithm.Parameters.TryGetValue(sp.Name, out IParameter param)) {
+          Transformer.Inject(param, sp);
+        }
+      }
+
+      foreach (var sp in obj.FreeParameters) {
+        if (algorithm.Parameters.TryGetValue(sp.Name, out IParameter param)) {
+          if(IsInRangeList(sp.Range, sp.Default) || 
+            IsInNumericRange<long>(sp.Default, sp.Range[0], sp.Range[1]) || 
+            IsInNumericRange<double>(sp.Default, sp.Range[0], sp.Range[1]))
+          Transformer.Inject(param, sp);
+        }
+      }
+
+
+      return algorithm;
+
+
+      /*
       TypeList = config[SParametersID][TListID].ToObject<Dictionary<string, string>>();
 
@@ -46 +68 @@
       UseFreeParams(problemData.Name, freeProblemParameters, algorithm.Problem);
       return algorithm;
+      */
+    }
+
+    private T CreateObject<T>(JCObject obj) {
+      Type type = Type.GetType(obj.Type);
+      return (T)Activator.CreateInstance(type);
     }
 
@@ -56 +84 @@
 
     private void ProcessParameters(JCObject obj, IParameterizedItem instance) {
-      foreach (var param in obj.Parameters)
+      foreach (var param in obj.StaticParameters)
         if (param.Default != null)
           SetParameterValue(FindPropertyByKey(instance, param.Name), param.Default);