Changeset 13841 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials

Timestamp:

05/10/16 16:55:18 (9 years ago)

Author:

jlodewyc

Message:

#2582 More parameter datatypes, splitting fileopening service, approving users, reopen last file, change name tasks and repetitions

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials

Files:

• BoolArray.cshtml (added)
• BoolMatrix.cshtml (added)
• DataMaster.cshtml (modified) (3 diffs)
• DoubleMatrix.cshtml (modified) (1 diff)
• IntMatrix.cshtml (added)
• OthersClean.cshtml (added)
• PercentArray.cshtml (added)
• PercentMatrix.cshtml (added)
• StringArray.cshtml (added)
• StringMatrix.cshtml (added)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials/DataMaster.cshtml

@@ -12 +12 @@
                 @Html.Partial("OpenFilePartials/DataPartials/Bool", Model);
             }
+            else if (Model.Data.ActualValue is BoolArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/BoolArray", Model);
+            }
+            else if (Model.Data.ActualValue is BoolMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/BoolMatrix", Model);
+            }
             else if (Model.Data.ActualValue is StringValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/String", Model);
+            }
+            else if (Model.Data.ActualValue is StringArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/StringArray", Model);
+            }
+            else if (Model.Data.ActualValue is StringMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/StringMatrix", Model);
             }
             else if (Model.Data.ActualValue is IntValue)
@@ -20 +36 @@
                 @Html.Partial("OpenFilePartials/DataPartials/Int", Model);
             }
+            else if (Model.Data.ActualValue is IntArray && !(Model.Data.ActualValue is HeuristicLab.Encodings.PermutationEncoding.Permutation))
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/IntArray", Model);
+            }
+            else if (Model.Data.ActualValue is IntMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/IntMatrix", Model);
+            }
             else if (Model.Data.ActualValue is PercentValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/Percent", Model);
             }
+            else if (Model.Data.ActualValue is PercentArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/PercentArray", Model);
+            }
+            else if (Model.Data.ActualValue is PercentMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/PercentMatrix", Model);
+            }
             else if (Model.Data.ActualValue is DoubleValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/Double", Model);
-            }
-            else if (Model.Data.ActualValue is IntArray)
-            {
-                @Html.Partial("OpenFilePartials/DataPartials/IntArray", Model);
             }
             else if (Model.Data.ActualValue is DoubleArray)
@@ -42 +70 @@
             else if (Model.Data.ActualValue is IItem)
             {
-                @Html.Partial("OpenFilePartials/DataPartials/Others", Model);
+                @Html.Partial("OpenFilePartials/DataPartials/OthersClean", Model);//just Others to print the datatype too 
                 }
         }
         catch(NotSupportedException e)
         {
-            @Html.Partial("OpenFilePartials/DataPartials/Others", Model)
+            @Html.Partial("OpenFilePartials/DataPartials/OthersClean", Model)
 
         }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials/DoubleMatrix.cshtml

@@ -10 +10 @@
         {
             s += "[ ";
-            s += dat[d,0] + "; " + dat[d,1];
+            for (var i = 0; i < dat.Columns; i++)
+            {
+                s += dat[d, i];
+                if (i < dat.Columns - 1)
+                {
+                    s += "; ";
+                }
+
+            }
             s += " ] " + Environment.NewLine;