Changeset 3717 for trunk/sources

Timestamp:

05/08/10 04:36:13 (15 years ago)

Author:

mkommend

Message:

sorting of column names in RunCollection and fixed errors in RunCollectionConstraints (ticket #970)

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• RunCollection.cs (modified) (2 diffs)
• RunCollectionConstraints/IRunCollectionConstraint.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization/3.3/IRunCollectionConstraint.cs) (1 diff)
• RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (3 diffs)
• RunCollectionConstraints/RunCollectionEqualityConstraint.cs (modified) (3 diffs)
• RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -104 +104 @@
     <Compile Include="Interfaces\IStrategyParameterCreator.cs" />
     <Compile Include="Interfaces\IRun.cs" />
-    <Compile Include="IRunCollectionConstraint.cs" />
+    <Compile Include="RunCollectionConstraints\IRunCollectionConstraint.cs" />
     <Compile Include="OptimizerList.cs" />
     <Compile Include="Experiment.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -147 +147 @@
 
     public IItem GetValue(IRun run, int columnIndex) {
+      string name = ((IStringConvertibleMatrix)this).ColumnNames.ElementAt(columnIndex);
+      return GetValue(run, name);
+    }
+
+    public IItem GetValue(IRun run, string columnName) {
       IItem value = null;
-      if (columnIndex < parameterNames.Count) {
-        string parameterName = parameterNames[columnIndex];
-        if (run.Parameters.ContainsKey(parameterName))
-          value = run.Parameters[parameterName];
-      } else if (columnIndex < parameterNames.Count + resultNames.Count) {
-        string resultName = resultNames[columnIndex - parameterNames.Count];
-        if (run.Results.ContainsKey(resultName))
-          value = run.Results[resultName];
-      }
+       if (run.Parameters.ContainsKey(columnName))
+         value = run.Parameters[columnName];
+       else if (run.Results.ContainsKey(columnName))
+         value = run.Results[columnName];
       return value;
     }
+
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -193 +194 @@
         List<string> value = new List<string>(parameterNames);
         value.AddRange(resultNames);
+        value.Sort();
         return value;
       }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs

@@ -29 +29 @@
   public interface IRunCollectionConstraint : IConstraint{
     new RunCollection ConstrainedValue { get; set; }
-    int ConstraintColumn { get; set; }
+    string ConstraintColumn { get; set; }
     event EventHandler ConstraintColumnChanged;
   }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -61 +61 @@
 
     [Storable]
-    private int constraintColumn;
-    public int ConstraintColumn {
+    private string constraintColumn;
+    public string ConstraintColumn {
       get { return constraintColumn; }
       set {
-        if (value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())
+        if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value))
           throw new ArgumentException("Could not set ConstraintData to not existing column index.");
         if (constraintColumn != value) {
@@ -80 +80 @@
       if (handler != null)
         handler(this, EventArgs.Empty);
+    }
+
+    protected override void OnConstrainedValueChanged() {
+      base.OnConstrainedValueChanged();
+      IStringConvertibleMatrix matrix = (IStringConvertibleMatrix)ConstrainedValue;
+      if (constraintColumn == null && ConstrainedValue != null && matrix.Columns != 0)
+        constraintColumn = matrix.ColumnNames.ElementAt(0);
     }
 
@@ -111 +118 @@
       IStringConvertibleMatrix matrix = ConstrainedValue;
       if (matrix != null && matrix.ColumnNames.Count() != 0)
-        s += matrix.ColumnNames.ElementAt(constraintColumn) + " ";
+        s += constraintColumn + " ";
       else
         return "ComparisonConstraint";

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

@@ -58 +58 @@
 
     [Storable]
-    private int constraintColumn;
-    public int ConstraintColumn {
+    private string constraintColumn;
+    public string ConstraintColumn {
       get { return constraintColumn; }
       set {
-        if (value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())
+        if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value))
           throw new ArgumentException("Could not set ConstraintData to not existing column index.");
         if (constraintColumn != value) {
@@ -77 +77 @@
       if (handler != null)
         handler(this, EventArgs.Empty);
+    }
+
+    protected override void OnConstrainedValueChanged() {
+      base.OnConstrainedValueChanged();
+      IStringConvertibleMatrix matrix = (IStringConvertibleMatrix)ConstrainedValue;
+      if (constraintColumn == null && ConstrainedValue != null && matrix.Columns != 0)
+        constraintColumn = matrix.ColumnNames.ElementAt(0);
     }
 
@@ -108 +115 @@
       IStringConvertibleMatrix matrix = ConstrainedValue;
       if (matrix != null && matrix.ColumnNames.Count() != 0)
-        s += matrix.ColumnNames.ElementAt(constraintColumn) + " ";
+        s += constraintColumn + " ";
       else
         return "EqualityConstraint";

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

@@ -51 +51 @@
     }
     [Storable]
-    private int constraintColumn;
-    public int ConstraintColumn {
+    private string constraintColumn;
+    public string ConstraintColumn {
       get { return constraintColumn; }
       set {
-        if (value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())
+        if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value))
           throw new ArgumentException("Could not set ConstraintData to not existing column index.");
         if (constraintColumn != value) {
@@ -70 +70 @@
       if (handler != null)
         handler(this, EventArgs.Empty);
+    }
+
+    protected override void OnConstrainedValueChanged() {
+      base.OnConstrainedValueChanged();
+      IStringConvertibleMatrix matrix = (IStringConvertibleMatrix)ConstrainedValue;
+      if (constraintColumn == null && ConstrainedValue != null && matrix.Columns != 0)
+        constraintColumn = matrix.ColumnNames.ElementAt(0);
     }
 
@@ -101 +108 @@
       IStringConvertibleMatrix matrix = ConstrainedValue;
       if (matrix != null && matrix.ColumnNames.Count() != 0)
-        s += matrix.ColumnNames.ElementAt(constraintColumn) + " ";
+        s += constraintColumn + " ";
       else
         return "TypeCompabitilityConstraint";