Changeset 16373 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data

Timestamp:

12/12/18 14:23:45 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• upgraded Google OR-Tools to version 6.10
• added TextValue and TextValueView to be able to display and edit a multiline string
• added parameter to set solver specific parameters for supported solvers
• added support for the Protocol Buffers representation of models (import/export)
• added import of MPS models
• added pause/stop functionality to CplexSolver and GlpkSolver
• refactored wrapper (LinearSolver and related enums)
• added new algorithm category Exact for LinearProgrammingAlgorithm

Location:

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3

Files:

• HeuristicLab.Data-3.3.csproj (modified) (2 diffs)
• Interfaces/ITextValue.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleValue.cs) (1 diff)
• TextValue.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/StringValue.cs) (2 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -124 +124 @@
     <Compile Include="ComparisonType.cs" />
     <Compile Include="EnumValue.cs" />
+    <Compile Include="Interfaces\ITextValue.cs" />
     <Compile Include="Interfaces\IValueTypeArray.cs" />
     <Compile Include="Path Types\DirectoryValue.cs" />
@@ -151 +152 @@
     <Compile Include="StringConvertibleArray.cs" />
     <Compile Include="StringMatrix.cs" />
+    <Compile Include="TextValue.cs" />
     <Compile Include="StringValue.cs" />
     <Compile Include="TimeSpanValue.cs" />

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Data {
-  public interface IStringConvertibleValue : IContent {
-    bool ReadOnly { get; }
-
-    bool Validate(string value, out string errorMessage);
-    string GetValue();
-    bool SetValue(string value);
-
-    event EventHandler ValueChanged;
+  public interface ITextValue : IStringConvertibleValue {
   }
 }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +25 @@
 
 namespace HeuristicLab.Data {
-  [Item("StringValue", "Represents a string.")]
+  [Item("TextValue", "Represents a multiline string.")]
   [StorableClass]
-  public class StringValue : Item, IComparable, IStringConvertibleValue {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
+  public class TextValue : StringValue, ITextValue {
+
+    public TextValue() {
+      this.value = string.Empty;
+      this.readOnly = false;
     }
 
-    [Storable]
-    protected string value;
-    public virtual string Value {
-      get { return value; }
-      set {
-        if (ReadOnly) throw new NotSupportedException("Value cannot be set. StringValue is read-only.");
-        if (value != this.value) {
-          if ((value != null) || (this.value != string.Empty)) {
-            this.value = value != null ? value : string.Empty;
-            OnValueChanged();
-          }
-        }
-      }
-    }
-
-    [Storable]
-    protected bool readOnly;
-    public virtual bool ReadOnly {
-      get { return readOnly; }
+    public TextValue(string value) {
+      this.value = value ?? string.Empty;
+      this.readOnly = false;
     }
 
     [StorableConstructor]
-    protected StringValue(bool deserializing) : base(deserializing) { }
-    protected StringValue(StringValue original, Cloner cloner)
+    protected TextValue(bool deserializing) : base(deserializing) { }
+
+    protected TextValue(TextValue original, Cloner cloner)
       : base(original, cloner) {
-      this.value = original.value != null ? original.value : string.Empty;
+      this.value = original.value ?? string.Empty;
       this.readOnly = original.readOnly;
-    }
-    public StringValue() {
-      this.value = string.Empty;
-      this.readOnly = false;
-    }
-    public StringValue(string value) {
-      this.value = value != null ? value : string.Empty;
-      this.readOnly = false;
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new StringValue(this, cloner);
+      return new TextValue(this, cloner);
     }
-
-    public virtual StringValue AsReadOnly() {
-      StringValue readOnlyStringValue = (StringValue)this.Clone();
-      readOnlyStringValue.readOnly = true;
-      return readOnlyStringValue;
-    }
-
-    public override string ToString() {
-      return value;
-    }
-
-    public virtual int CompareTo(object obj) {
-      StringValue other = obj as StringValue;
-      if (other != null)
-        return Value.CompareTo(other.Value);
-      else
-        return Value.CompareTo(obj);
-    }
-
-    public event EventHandler ValueChanged;
-    protected virtual void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, EventArgs.Empty);
-      OnToStringChanged();
-    }
-
-    protected virtual bool Validate(string value, out string errorMessage) {
-      if (value == null) {
-        errorMessage = "Invalid Value (string must not be null)";
-        return false;
-      } else {
-        errorMessage = string.Empty;
-        return true;
-      }
-    }
-    protected virtual string GetValue() {
-      return Value;
-    }
-    protected virtual bool SetValue(string value) {
-      if (value != null) {
-        Value = value;
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    #region IStringConvertibleValue Members
-    bool IStringConvertibleValue.Validate(string value, out string errorMessage) {
-      return Validate(value, out errorMessage);
-    }
-    string IStringConvertibleValue.GetValue() {
-      return GetValue();
-    }
-    bool IStringConvertibleValue.SetValue(string value) {
-      return SetValue(value);
-    }
-    #endregion
   }
 }