Context Navigation

Changeset 17540 for branches/3026_IntegrationIntoSymSpace

Timestamp:

05/12/20 17:06:04 (5 years ago)

Author:

dpiringe

Message:

#3026:

added new converter: BatchRunConverter, ExperimentConverter
fixed a bug with the path of the .hl file in JCGenerator
fixed a bug with a redundant search for a suitable converter in JsonItemConverter
added a restriction for TargetVariable and AllowedInputVariables in RegressionProblemDataConverter
removed unnecessary code in Runner

Location:

branches/3026_IntegrationIntoSymSpace

Files:

-                      r17519
+                      r17540
           if (configuredResults.Contains(res.Key)) {
             if (res.Value is ISymbolicRegressionSolution solution) {
-              /* TEST */
-              var csFormatter = new CSharpSymbolicExpressionTreeStringFormatter();
-              File.WriteAllText(@"C:\Workspace\output\csFormatted.cs", csFormatter.Format(solution.Model.SymbolicExpressionTree));
-              /* END TEST */
               var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
               var x = formatter.Format(solution.Model.SymbolicExpressionTree);

-                      r17519
+                      r17540
       };
+    }
+    private IJsonItem GetTargetVariable(IItem item) =>
+      new StringJsonItem() {
+    private IJsonItem GetTargetVariable(IItem item) {
+      var vars = (IEnumerable<StringValue>)((dynamic)item).InputVariables;
+      return new StringJsonItem() {
         Name = TargetVariable,
         Value = (string)((dynamic)item).TargetVariable,
+        //ConcreteRestrictedItems = variables.Select(x => x.Value)
+      };
+    private IJsonItem GetAllowedInputVariables(IItem item) =>
+      new StringArrayJsonItem() {
+        ConcreteRestrictedItems = vars.Select(x => x.Value)
+      };
+    }
+    private IJsonItem GetAllowedInputVariables(IItem item) {
+      var vars = (IEnumerable<StringValue>)((dynamic)item).InputVariables;
+      return new StringArrayJsonItem() {
         Name = AllowedInputVariables,
         Value = ((IEnumerable<string>)((dynamic)item).AllowedInputVariables).ToArray(),
+        //ConcreteRestrictedItems = variables.Select(x => x.Value)
+      };
+        ConcreteRestrictedItems = vars.Select(x => x.Value)
+      };
+    }
     #endregion
+  }

r17483	r17540
63	63	<Compile Include="Constants.cs" />
64	64	<Compile Include="Converters\AlgorithmConverter.cs" />
	65	<Compile Include="Converters\BatchRunConverter.cs" />
	66	<Compile Include="Converters\ExperimentConverter.cs" />
65	67	<Compile Include="Converters\RegressionProblemDataConverter.cs" />
66	68	<Compile Include="Converters\ResultParameterConverter.cs" />

r17519	r17540
31	31	#region Serialize HL File
32	32	ProtoBufSerializer serializer = new ProtoBufSerializer();
33		string hlFilePath = ~~fullPath + templateName + ".hl"~~;
	33	string hlFilePath = Path.Combine(fullPath, templateName + ".hl");
34	34	serializer.Serialize(optimizer, hlFilePath);
35	35	#endregion

r17519	r17540
62	62	IJsonItemConverter converter = GetConverter(item.GetType());
63	63	if (converter == null) return new UnsupportedJsonItem();
64		IJsonItem tmp = ~~GetConverter(item.GetType())~~.Extract(item, root);
	64	IJsonItem tmp = converter.Extract(item, root);
65	65	ExtractCache.Add(hash, tmp);
66	66	return tmp;

Note: See TracChangeset for help on using the changeset viewer.