Changeset 17269 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCGenerator.cs

Timestamp:

09/25/19 17:18:41 (5 years ago)

Author:

dpiringe

Message:

#3026

• deleted IItemExtensions.cs
• fixed a bug in GetInterfaceDistance in TypeExtensions.cs -> generic types were ignored
• lots of code clean ups
• added new transformers: ParameterizedItemTransformer, MultiCheckedOperatorTransformer

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCGenerator.cs (modified) (6 diffs)

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

@@ -16 +16 @@
 
   public class CustomWriter : JsonTextWriter {
+    private const int ArrayFlatterLvl = 1;
     private Stack<Formatting> formattings = new Stack<Formatting>();
     private int lvl = 0;
     public override void WriteStartArray() {
       base.WriteStartArray();
-      if(lvl > 1) {
+      if(lvl > ArrayFlatterLvl) {
         formattings.Push(base.Formatting);
         base.Formatting = Formatting.None;
@@ -30 +31 @@
       base.WriteEndArray();
       lvl--;
-      if (lvl > 1)
+      if (lvl > ArrayFlatterLvl)
         base.Formatting = formattings.Pop();
     }
@@ -49 +50 @@
 
     private JObject template = JObject.Parse(@"{
-      'Metadata': {},
-      'FreeParameters': {},
-      'StaticParameters': {
-        'Algorithm':{},
-        'Problem':{},
-        'TypeList':{}
-      }
+      'Metadata': {
+        'Algorithm':'',
+        'Problem':''
+      },
+      'Objects': []
     }");
 
     
     private Dictionary<string, string> TypeList = new Dictionary<string, string>();
-
+    
     public string GenerateTemplate(IAlgorithm algorithm, IProblem problem, params string[] freeParameters) {
       algorithm.Problem = problem;
-      IList<JCObject> items = BJCO(algorithm);
+      ParameterData algorithmData = Transformer.Extract(algorithm);
+      ParameterData problemData = Transformer.Extract(problem);
+      IList<ParameterData> items = algorithmData.ParameterizedItems;
+      foreach (var pItem in problemData.ParameterizedItems) items.Add(pItem);
       JArray jsonItems = new JArray();
       
-      foreach(var item in items) {
+      foreach(var item in items.Distinct()) {
         JToken token = JObject.FromObject(item, Settings());
-
+        token["StaticParameters"] = token["Parameters"];
+        token["FreeParameters"] = token["Parameters"];
+        token.Cast<JObject>().Property("Parameters")?.Remove();
         RefactorFreeParameters(token, freeParameters);
         RefactorStaticParameters(token);
         if(token["StaticParameters"].HasValues || token["FreeParameters"].HasValues)
           jsonItems.Add(token);
-      } 
-      return CustomWriter.Serialize(jsonItems);
+      }
+
+      template["Metadata"]["Algorithm"] = algorithm.Name;
+      template["Metadata"]["Problem"] = problem.Name;
+      template["Objects"] = jsonItems;
+
+      return CustomWriter.Serialize(template);
     }
 
+    #region Helper
     private void RefactorFreeParameters(JToken token, string[] freeParameters) {
 
-      token["FreeParameters"] = token["StaticParameters"];
+      //token["FreeParameters"] = token["StaticParameters"];
 
       IList<JObject> objToRemove = new List<JObject>();
@@ -98 +108 @@
       }, token["FreeParameters"]);
       foreach (var x in objToRemove) x.Remove();
-     
+
     }
 
@@ -110 +120 @@
       foreach (var x in objToRemove) x.Remove();
     }
-      
-    
-
-    #region Helper
-    private IList<JCObject> BJCO(IParameterizedItem item) {
-      List<JCObject> list = new List<JCObject>();
-      JCObject obj = new JCObject();
-      obj.Name = item.ItemName;
-      obj.Type = item.GetType().AssemblyQualifiedName;
-      obj.StaticParameters = new List<ParameterData>();
-      list.Add(obj);
-
-      foreach (var param in item.Parameters) {
-        if(!param.Hidden) {
-          obj.StaticParameters.Add(Transformer.Extract(param));
-
-          if (param is IParameterizedItem)
-            list.AddRange(BJCO(param.Cast<IParameterizedItem>()));
-          
-          if (param.GetType().IsEqualTo(typeof(IConstrainedValueParameter<>)))
-            foreach (var validValue in param.Cast<dynamic>().ValidValues)
-              if (validValue is IParameterizedItem && 
-                ((IParameterizedItem)validValue).Parameters.Any(p => !p.Hidden))
-                list.AddRange(BJCO((IParameterizedItem)validValue));
-        }
-      }
-      return list;
-    }
-
 
     private JsonSerializer Settings() => new JsonSerializer() {
@@ -152 +133 @@
     }
     #endregion
-
-    /*
-    private void ExtractOperatorInfo(IItem item, ParameterData obj) {
-      if (item is IMultiOperator) {
-        foreach (var op in ((IMultiOperator)item).Operators) {
-          ParameterData newOperator = BuildJCParameter(op);
-          if (obj.Operators == null)
-            obj.Operators = new List<ParameterData>();
-          obj.Operators.Add(newOperator);
-          newOperator.Name = op.GetType().Name;
-
-          newOperator.Path = obj.Path + ".Operators." + op.Name;
-          MultiPermutationManipulator manipulator = new MultiPermutationManipulator();
-        }
-      }
-    }*/
   }
 }