Changeset 3729 for trunk

Timestamp:

05/10/10 00:51:36 (15 years ago)

Author:

swagner

Message:

Fixed exception thrown in OperatorGraph views when removing one of the operator parameters of a MultiOperator (#1004)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/OperatorTreeView.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

@@ -225 +225 @@
       else {
         IValueParameter opParam = (IValueParameter)sender;
-        foreach (TreeNode node in opParamNodeTable[opParam].ToArray())
-          ClearTreeNode(node);
-        foreach (TreeNode node in opParamNodeTable[opParam]) {
-          node.Text = opParam.Name + ": ";
-          FillTreeNode(node, (IOperator)opParam.Value);
+        if (opParamNodeTable.ContainsKey(opParam)) {
+          foreach (TreeNode node in opParamNodeTable[opParam].ToArray())
+            ClearTreeNode(node);
+          foreach (TreeNode node in opParamNodeTable[opParam]) {
+            node.Text = opParam.Name + ": ";
+            FillTreeNode(node, (IOperator)opParam.Value);
+          }
         }
       }

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -142 +142 @@
 
       // remove edges to removed operator
-      var opParams = from o in Operators
-                     from p in o.Parameters
-                     where p is IValueParameter
-                     where typeof(IOperator).IsAssignableFrom(((IValueParameter)p).DataType)
-                     where (((IValueParameter)p).Value != null) && (((IValueParameter)p).Value == op)
-                     select (IValueParameter)p;
+      IValueParameter[] opParams = (from o in Operators
+                                    from p in o.Parameters
+                                    where p is IValueParameter
+                                    where typeof(IOperator).IsAssignableFrom(((IValueParameter)p).DataType)
+                                    where (((IValueParameter)p).Value != null) && (((IValueParameter)p).Value == op)
+                                    select (IValueParameter)p).ToArray();
       foreach (IValueParameter opParam in opParams)
         opParam.Value = null;

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

@@ -363 +363 @@
     private void opParam_ValueChanged(object sender, EventArgs e) {
       IValueParameter opParam = (IValueParameter)sender;
-      IOperator op = this.parameterOperatorMapping[opParam];
-      IOperatorShapeInfo shapeInfoFrom = this.operatorShapeInfoMapping.GetByFirst(op);
-      KeyValuePair<IOperatorShapeInfo, string> connectionFrom = new KeyValuePair<IOperatorShapeInfo, string>(shapeInfoFrom, opParam.Name);
-
-      this.connectionInfos.RemoveWhere(c => c.From == shapeInfoFrom && c.ConnectorFrom == opParam.Name);
-      if (opParam.Value != null) {
-        if (!this.operatorShapeInfoMapping.ContainsFirst((IOperator)opParam.Value))
-          this.AddOperator((IOperator)opParam.Value);
-        IOperatorShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst((IOperator)opParam.Value);
-        base.AddConnectionInfo(new ConnectionInfo(shapeInfoFrom, opParam.Name, shapeInfoTo, OperatorShapeInfoFactory.PredecessorConnector));
+      if (this.parameterOperatorMapping.ContainsKey(opParam)) {
+        IOperator op = this.parameterOperatorMapping[opParam];
+        IOperatorShapeInfo shapeInfoFrom = this.operatorShapeInfoMapping.GetByFirst(op);
+        KeyValuePair<IOperatorShapeInfo, string> connectionFrom = new KeyValuePair<IOperatorShapeInfo, string>(shapeInfoFrom, opParam.Name);
+
+        this.connectionInfos.RemoveWhere(c => c.From == shapeInfoFrom && c.ConnectorFrom == opParam.Name);
+        if (opParam.Value != null) {
+          if (!this.operatorShapeInfoMapping.ContainsFirst((IOperator)opParam.Value))
+            this.AddOperator((IOperator)opParam.Value);
+          IOperatorShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst((IOperator)opParam.Value);
+          base.AddConnectionInfo(new ConnectionInfo(shapeInfoFrom, opParam.Name, shapeInfoTo, OperatorShapeInfoFactory.PredecessorConnector));
+        }
       }
     }

trunk/sources/HeuristicLab.Operators/3.3/MultiOperator.cs

@@ -86 +86 @@
       operatorParameters.Clear();
       for (int i = 0; i < Operators.Count; i++) {
-        IValueParameter<T> opParam = new ValueParameter<T>(i.ToString(), string.Empty, Operators[i]);
+        IValueParameter<T> opParam = new OptionalValueParameter<T>(i.ToString(), string.Empty, Operators[i]);
         opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
         Parameters.Add(opParam);
@@ -127 +127 @@
     private void opParam_ValueChanged(object sender, EventArgs e) {
       IValueParameter<T> opParam = (IValueParameter<T>)sender;
-      operators[operatorParameters.IndexOf(opParam)] = opParam.Value;
+      if (opParam.Value == null)
+        operators.RemoveAt(operatorParameters.IndexOf(opParam));
+      else
+        operators[operatorParameters.IndexOf(opParam)] = opParam.Value;
     }
     #endregion