Changeset 17473 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs

Timestamp:

03/10/20 17:17:37 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored inheritance structure of json items, now the default JsonItem is an abstract class without properties Value and Range -> splitted up into new interfaces
• updated view models for new json item structure
• updated SingleLineArrayJsonWriter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs (modified) (2 diffs)

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

@@ -10 +10 @@
 
   public class DoubleMatrixValueVM : MatrixValueVM<double, DoubleMatrixJsonItem> {
-    public override Type JsonItemType => typeof(DoubleMatrixJsonItem);
+    public override Type TargetedJsonItemType => typeof(DoubleMatrixJsonItem);
     public override UserControl Control =>
       new JsonItemDoubleMatrixValueControl(this);
@@ -27 +27 @@
   }
 
-  public abstract class MatrixValueVM<T, JsonItemType> : RangedValueBaseVM<T>, IMatrixJsonItemVM
-    where JsonItemType : IMatrixJsonItem {
+  public abstract class MatrixValueVM<T, JsonItemType> : RangedValueBaseVM<T, JsonItemType>, IMatrixJsonItemVM
+    where T : IComparable
+    where JsonItemType : class, IMatrixJsonItem, IIntervalRestrictedJsonItem<T> {
     public abstract T[][] Value { get; set; }
     public bool RowsResizable {