Changeset 17439

Timestamp:

02/17/20 15:13:17 (4 years ago)

Author:

dpiringe

Message:

#3026:

• fixed a bug in HeuristicLab.JsonInterface.App -> now the Runner checks if the instantiated optimizer is an EngineAlgorithm, if true: Engine = SequentialEngine (engine can be configured in later versions)
• added a TabControl in ExportJsonDialog for parameters and results
• updated parameter tree view with checkboxes (and linked them with VM)
• renamed ActivatedResults to Results for templates
• fixed a bug with injection of operators in MultiCheckedOperatorConverter -> now operators of an ValueParameter get set correctly
• updated MultiCheckedOperatorConverter to extract/inject parameters of operators
• fixed bug with path for template -> removed usage of method Path.GetDirectoryName, returned wrong results
• splitted cache for JsonItemConverter into a cache for injection and extraction
• JsonTemplateInstantiator now uses first item in objects array instead of searching for an object with template name

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/HeuristicLab.JsonInterface.App.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface.App/Runner.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.Designer.cs (modified) (12 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (4 diffs)
• HeuristicLab.JsonInterface/Constants.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs (modified) (3 diffs)
• HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface/JCGenerator.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/JsonItemConverter.cs (modified) (4 diffs)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (1 diff)
• Heuristiclab.ConfigStarter/Program.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/HeuristicLab.JsonInterface.App.csproj

@@ -83 +83 @@
       <Name>HeuristicLab.Problems.Instances-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj">
+      <Project>{DC3D7072-7999-4719-B65D-3997744D5DC1}</Project>
+      <Name>HeuristicLab.SequentialEngine-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -7 +7 @@
 using System.Threading.Tasks;
 using HeuristicLab.Optimization;
+using HeuristicLab.SequentialEngine;
 
 namespace HeuristicLab.JsonInterface.App {
@@ -12 +13 @@
     internal static void Run(string template, string config, string outputFile = @"C:\Workspace\test.txt") {
       IOptimizer optimizer = JsonTemplateInstantiator.Instantiate(template, config);
-  
+      if(optimizer is EngineAlgorithm e)
+        e.Engine = new SequentialEngine.SequentialEngine();
+      
       Task task = optimizer.StartAsync();
       while(!task.IsCompleted) {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs

@@ -42 +42 @@
       set {
         selected = value;
-        if(TreeNode != null)
+        if(TreeNode != null) {
           TreeNode.ForeColor = (selected ? Color.Black : Color.Red);
+          TreeNode.Checked = value;
+        }
         if (TreeView != null)
           TreeView.Refresh();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.Designer.cs

@@ -30 +30 @@
       this.groupBoxDetails = new System.Windows.Forms.GroupBox();
       this.panel = new System.Windows.Forms.Panel();
-      this.jsonItemBindingSource = new System.Windows.Forms.BindingSource(this.components);
       this.resultItems = new System.Windows.Forms.CheckedListBox();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
       this.groupBox3 = new System.Windows.Forms.GroupBox();
-      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+      this.tabControl1 = new System.Windows.Forms.TabControl();
+      this.tabPage1 = new System.Windows.Forms.TabPage();
+      this.tabPage2 = new System.Windows.Forms.TabPage();
+      this.jsonItemBindingSource = new System.Windows.Forms.BindingSource(this.components);
       this.groupBoxDetails.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).BeginInit();
       this.groupBox2.SuspendLayout();
       this.groupBox3.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-      this.splitContainer1.Panel1.SuspendLayout();
-      this.splitContainer1.Panel2.SuspendLayout();
-      this.splitContainer1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
       this.splitContainer2.Panel1.SuspendLayout();
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
+      this.tabControl1.SuspendLayout();
+      this.tabPage1.SuspendLayout();
+      this.tabPage2.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).BeginInit();
       this.SuspendLayout();
       // 
@@ -60 +61 @@
       this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.exportButton.Location = new System.Drawing.Point(3, 570);
+      this.exportButton.Location = new System.Drawing.Point(591, 578);
       this.exportButton.Name = "exportButton";
-      this.exportButton.Size = new System.Drawing.Size(422, 29);
+      this.exportButton.Size = new System.Drawing.Size(229, 29);
       this.exportButton.TabIndex = 1;
       this.exportButton.Text = "Export";
@@ -73 +74 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.treeView.CheckBoxes = true;
       this.treeView.Location = new System.Drawing.Point(6, 19);
       this.treeView.Name = "treeView";
-      this.treeView.Size = new System.Drawing.Size(353, 327);
+      this.treeView.Size = new System.Drawing.Size(352, 497);
       this.treeView.TabIndex = 3;
       this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
@@ -85 +87 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBoxDetails.Controls.Add(this.panel);
-      this.groupBoxDetails.Location = new System.Drawing.Point(3, 3);
+      this.groupBoxDetails.Location = new System.Drawing.Point(3, 0);
       this.groupBoxDetails.Name = "groupBoxDetails";
-      this.groupBoxDetails.Size = new System.Drawing.Size(422, 561);
+      this.groupBoxDetails.Size = new System.Drawing.Size(415, 522);
       this.groupBoxDetails.TabIndex = 4;
       this.groupBoxDetails.TabStop = false;
@@ -100 +102 @@
       this.panel.Location = new System.Drawing.Point(7, 20);
       this.panel.Name = "panel";
-      this.panel.Size = new System.Drawing.Size(409, 535);
+      this.panel.Size = new System.Drawing.Size(402, 496);
       this.panel.TabIndex = 0;
-      // 
-      // jsonItemBindingSource
-      // 
-      this.jsonItemBindingSource.DataSource = typeof(HeuristicLab.JsonInterface.IJsonItem);
       // 
       // resultItems
@@ -115 +113 @@
       this.resultItems.Location = new System.Drawing.Point(6, 19);
       this.resultItems.Name = "resultItems";
-      this.resultItems.Size = new System.Drawing.Size(353, 199);
+      this.resultItems.Size = new System.Drawing.Size(777, 499);
       this.resultItems.TabIndex = 5;
       // 
@@ -124 +122 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox2.Controls.Add(this.treeView);
-      this.groupBox2.Location = new System.Drawing.Point(3, 3);
+      this.groupBox2.Location = new System.Drawing.Point(0, 0);
       this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(365, 352);
+      this.groupBox2.Size = new System.Drawing.Size(364, 522);
       this.groupBox2.TabIndex = 6;
       this.groupBox2.TabStop = false;
@@ -137 +135 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox3.Controls.Add(this.resultItems);
-      this.groupBox3.Location = new System.Drawing.Point(3, 3);
+      this.groupBox3.Location = new System.Drawing.Point(6, 6);
       this.groupBox3.Name = "groupBox3";
-      this.groupBox3.Size = new System.Drawing.Size(365, 231);
+      this.groupBox3.Size = new System.Drawing.Size(789, 522);
       this.groupBox3.TabIndex = 7;
       this.groupBox3.TabStop = false;
       this.groupBox3.Text = "Result Elements";
       // 
-      // splitContainer1
-      // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer1.Location = new System.Drawing.Point(3, 3);
-      this.splitContainer1.Name = "splitContainer1";
-      this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-      // 
-      // splitContainer1.Panel1
-      // 
-      this.splitContainer1.Panel1.Controls.Add(this.groupBox2);
-      // 
-      // splitContainer1.Panel2
-      // 
-      this.splitContainer1.Panel2.Controls.Add(this.groupBox3);
-      this.splitContainer1.Size = new System.Drawing.Size(371, 599);
-      this.splitContainer1.SplitterDistance = 358;
-      this.splitContainer1.TabIndex = 8;
-      // 
       // splitContainer2
       // 
@@ -169 +147 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer2.Location = new System.Drawing.Point(12, 12);
+      this.splitContainer2.Location = new System.Drawing.Point(6, 6);
       this.splitContainer2.Name = "splitContainer2";
       // 
       // splitContainer2.Panel1
       // 
-      this.splitContainer2.Panel1.Controls.Add(this.splitContainer1);
+      this.splitContainer2.Panel1.Controls.Add(this.groupBox2);
       // 
       // splitContainer2.Panel2
       // 
       this.splitContainer2.Panel2.Controls.Add(this.groupBoxDetails);
-      this.splitContainer2.Panel2.Controls.Add(this.exportButton);
-      this.splitContainer2.Size = new System.Drawing.Size(809, 605);
-      this.splitContainer2.SplitterDistance = 377;
+      this.splitContainer2.Size = new System.Drawing.Size(789, 522);
+      this.splitContainer2.SplitterDistance = 367;
       this.splitContainer2.TabIndex = 9;
+      // 
+      // tabControl1
+      // 
+      this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl1.Controls.Add(this.tabPage1);
+      this.tabControl1.Controls.Add(this.tabPage2);
+      this.tabControl1.Location = new System.Drawing.Point(12, 12);
+      this.tabControl1.Name = "tabControl1";
+      this.tabControl1.SelectedIndex = 0;
+      this.tabControl1.Size = new System.Drawing.Size(809, 560);
+      this.tabControl1.TabIndex = 10;
+      // 
+      // tabPage1
+      // 
+      this.tabPage1.Controls.Add(this.splitContainer2);
+      this.tabPage1.Location = new System.Drawing.Point(4, 22);
+      this.tabPage1.Name = "tabPage1";
+      this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+      this.tabPage1.Size = new System.Drawing.Size(801, 534);
+      this.tabPage1.TabIndex = 0;
+      this.tabPage1.Text = "Parameters";
+      this.tabPage1.UseVisualStyleBackColor = true;
+      // 
+      // tabPage2
+      // 
+      this.tabPage2.Controls.Add(this.groupBox3);
+      this.tabPage2.Location = new System.Drawing.Point(4, 22);
+      this.tabPage2.Name = "tabPage2";
+      this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+      this.tabPage2.Size = new System.Drawing.Size(801, 534);
+      this.tabPage2.TabIndex = 1;
+      this.tabPage2.Text = "Results";
+      this.tabPage2.UseVisualStyleBackColor = true;
+      // 
+      // jsonItemBindingSource
+      // 
+      this.jsonItemBindingSource.DataSource = typeof(HeuristicLab.JsonInterface.IJsonItem);
       // 
       // ExportJsonDialog
@@ -188 +204 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(833, 629);
-      this.Controls.Add(this.splitContainer2);
+      this.ClientSize = new System.Drawing.Size(833, 619);
+      this.Controls.Add(this.exportButton);
+      this.Controls.Add(this.tabControl1);
       this.Name = "ExportJsonDialog";
       this.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -195 +212 @@
       this.Text = "Export Json";
       this.groupBoxDetails.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).EndInit();
       this.groupBox2.ResumeLayout(false);
       this.groupBox3.ResumeLayout(false);
-      this.splitContainer1.Panel1.ResumeLayout(false);
-      this.splitContainer1.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-      this.splitContainer1.ResumeLayout(false);
       this.splitContainer2.Panel1.ResumeLayout(false);
       this.splitContainer2.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
       this.splitContainer2.ResumeLayout(false);
+      this.tabControl1.ResumeLayout(false);
+      this.tabPage1.ResumeLayout(false);
+      this.tabPage2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).EndInit();
       this.ResumeLayout(false);
 
@@ -222 +238 @@
     private System.Windows.Forms.GroupBox groupBox2;
     private System.Windows.Forms.GroupBox groupBox3;
-    private System.Windows.Forms.SplitContainer splitContainer1;
     private System.Windows.Forms.SplitContainer splitContainer2;
+    private System.Windows.Forms.TabControl tabControl1;
+    private System.Windows.Forms.TabPage tabPage1;
+    private System.Windows.Forms.TabPage tabPage2;
   }
 }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

@@ -18 +18 @@
     private static SaveFileDialog SaveFileDialog { get; set; }
     private IDictionary<int, UserControl> Hash2Control { get; set; } = new Dictionary<int, UserControl>();
+    private IDictionary<TreeNode, JsonItemVMBase> Node2VM { get; set; } = new Dictionary<TreeNode, JsonItemVMBase>();
     private IJsonItem Root { get; set; }
     private IOptimizer Optimizer { get; set; }
@@ -38 +39 @@
         Root = JsonItemConverter.Extract(Optimizer);
         TreeNode parent = new TreeNode(Root.Name);
-
+        treeView.AfterCheck += TreeView_AfterCheck;
         BuildTreeNode(parent, Root);
         treeView.Nodes.Add(parent);
@@ -44 +45 @@
         
       } 
+    }
+
+    private void TreeView_AfterCheck(object sender, TreeViewEventArgs e) {
+      if (e.Action != TreeViewAction.Unknown) {
+        if (Node2VM.TryGetValue(e.Node, out JsonItemVMBase vm)) {
+          vm.Selected = e.Node.Checked;
+        }
+      }
     }
 
@@ -107 +116 @@
         vm.TreeNode = node;
         vm.TreeView = treeView;
+        Node2VM.Add(node, vm);
+        node.Checked = vm.Selected;
         UserControl control = vm.GetControl();
         Hash2Control.Add(node.GetHashCode(), control);

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Constants.cs

@@ -15 +15 @@
     internal const string HLFileLocation = "HLFileLocation";
     internal const string Parameters = "Parameters";
-    internal const string ActivatedResults = "ActivatedResults";
+    internal const string Results = "Results";
 
     internal const string Template = @"{
@@ -23 +23 @@
       },
       '" + Parameters + @"': [],
-      '" + ActivatedResults + @"': []
+      '" + Results + @"': []
     }";
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs

@@ -16 +16 @@
 
       dynamic val = item as dynamic;
-      foreach (var op in val.Operators)
-        val.Operators.SetItemCheckedState(op, GetOperatorState(op.Name, data));
+      foreach (var op in val.Operators) {
+        IJsonItem childItem = GetChildItem(op.Name, data);
+        if(childItem != null) {
+          if(childItem.Value is bool b) {
+            val.Operators.SetItemCheckedState(op, b);
+          }
+          root.Inject((IItem)op, childItem, root);
+        }
+      }
     }
 
@@ -24 +31 @@
       dynamic val = value as dynamic;
       foreach (var op in val.Operators) {
-        item.AddChildren(new BoolJsonItem() {
+        IJsonItem operatorItem = new BoolJsonItem() {
           Name = op.Name,
           Description = op.Description,
           Value = val.Operators.ItemChecked(op),
           Range = new bool[] { false, true }
-        });
+        };
+        IJsonItem c = root.Extract((IItem)op, root);
+        if(c != null && c.Children != null)
+          operatorItem.AddChildren(c.Children);
+        item.AddChildren(operatorItem);
       }
       return item;
@@ -42 +53 @@
       return false;
     }
+
+    private IJsonItem GetChildItem(string name, IJsonItem parent) {
+      foreach(var c in parent.Children) {
+        if (c.Name == name) return c;
+      }
+      return null;
+    }
     #endregion
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs

@@ -16 +16 @@
       if (parameter.ActualValue == null && data.Value != null)
         parameter.ActualValue = Instantiate(parameter.DataType);
-      root.Inject(parameter.ActualValue, data, root);
+
+      if(parameter.ActualValue != null) {
+          if (data.Children == null || data.Children.Count == 0)
+            root.Inject(parameter.ActualValue, data, root);
+          else
+            root.Inject(parameter.ActualValue, data.Children?.First(), root);
+         
+      }
     }
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

@@ -64 +64 @@
     <Compile Include="Converters\AlgorithmConverter.cs" />
     <Compile Include="Converters\RegressionProblemDataConverter.cs" />
+    <Compile Include="Converters\ResultParameterConverter.cs" />
     <Compile Include="Converters\ValueLookupParameterConverter.cs" />
     <Compile Include="Converters\ValueRangeConverter.cs" />

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

@@ -29 +29 @@
       JArray resultItems = new JArray();
       IList<IJsonItem> jsonItems = new List<IJsonItem>();
-      string fullPath = Path.GetDirectoryName(Path.GetFullPath(path));
+      string fullPath = Path.GetFullPath(path);
       
       // recursively filter items with values/ranges/actualNames
@@ -51 +51 @@
       template[Constants.Metadata][Constants.HLFileLocation] = hlFilePath;
       template[Constants.Parameters] = parameterItems;
-      template[Constants.ActivatedResults] = resultItems;
+      template[Constants.Results] = resultItems;
 
       // serialize template and write file

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs

@@ -20 +20 @@
       = new Dictionary<Type, IJsonItemConverter>();
 
-    private IDictionary<int, IJsonItem> Cache { get; set; }
+    private IDictionary<int, IJsonItem> InjectCache { get; set; }
+      = new Dictionary<int, IJsonItem>();
+
+    private IDictionary<int, IJsonItem> ExtractCache { get; set; }
       = new Dictionary<int, IJsonItem>();
 
@@ -52 +55 @@
     
     public void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      if(item != null && !Cache.ContainsKey(item.GetHashCode())) {
+      if (item != null && !InjectCache.ContainsKey(item.GetHashCode())) {
         IJsonItemConverter converter = GetConverter(item.GetType());
         if(converter != null) converter.Inject(item, data, root);
+        InjectCache.Add(item.GetHashCode(), data);
       }
     }
@@ -60 +64 @@
     public IJsonItem Extract(IItem item, IJsonItemConverter root) {
       int hash = item.GetHashCode();
-      if (Cache.TryGetValue(hash, out IJsonItem val))
+      if (ExtractCache.TryGetValue(hash, out IJsonItem val))
         return val;
       else {
@@ -66 +70 @@
         if (converter == null) return new UnsupportedJsonItem();
         IJsonItem tmp = GetConverter(item.GetType()).Extract(item, root);
-        Cache.Add(hash, tmp);
+        ExtractCache.Add(hash, tmp);
         return tmp;
       }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

@@ -58 +58 @@
 
       // get algorthm data and object
-      IJsonItem optimizerData = instData.Objects[optimizerName];
-
+      IJsonItem optimizerData = instData.Objects.First().Value;
+      
       // inject configuration
       JsonItemConverter.Inject(optimizer, optimizerData);

branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs

@@ -46 +46 @@
 
       JCGenerator generator = new JCGenerator();
-      generator.GenerateTemplate(@"C:\Workspace\Template.json", alg);
-      JsonTemplateInstantiator.Instantiate(@"C:\Workspace\Template.json");
-      /*
+      generator.GenerateTemplate(@"C:\Workspace", "Template", alg);
+      //JsonTemplateInstantiator.Instantiate(@"C:\Workspace\Template.json");
+      
       List<ICommandLineArgument> arguments = new List<ICommandLineArgument>();
       arguments.Add(new StartArgument("JsonInterface"));
@@ -55 +55 @@
 
       app.Run(arguments.ToArray());
-      */
+      
     }
   }