Context Navigation

Changeset 3527 for trunk

Timestamp:

04/26/10 01:38:30 (15 years ago)

Author:

abeham

Message:

Added an exception to indicate that multi crossover doesn't contain any crossovers (also for manipulators)
fixed text in StochasticMultiOperator
#893

Location:

trunk/sources

Files:

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
76	77	}
77	78	}
	79
	80	public override IOperation Apply() {
	81	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one binary vector crossover to choose from.");
	82	return base.Apply();
	83	}
78	84	}
79	85	}

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
76	77	}
77	78	}
	79
	80	public override IOperation Apply() {
	81	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one integer vector crossover to choose from.");
	82	return base.Apply();
	83	}
78	84	}
79	85	}

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
76	77	}
77	78	}
	79
	80	public override IOperation Apply() {
	81	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation crossover to choose from.");
	82	return base.Apply();
	83	}
78	84	}
79	85	}

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
68	69	}
69	70	}
	71
	72	public override IOperation Apply() {
	73	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation manipulator to choose from.");
	74	return base.Apply();
	75	}
70	76	}
71	77	}

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
81	82	}
82	83	}
	84
	85	public override IOperation Apply() {
	86	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one real vector crossover to choose from.");
	87	return base.Apply();
	88	}
83	89	}
84	90	}

r3445	r3527
20	20	#endregion
21	21
	22	using System;
22	23	using System.Linq;
23	24	using HeuristicLab.Collections;
…	…
74	75	}
75	76	}
	77
	78	public override IOperation Apply() {
	79	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one real vector manipulator to choose from.");
	80	return base.Apply();
	81	}
76	82	}
77	83	}

-                      r3445
+                      r3527
   /// Base class for stochastic multi operators.
   /// </summary>
   [Item("StochasticMultiOperator", "Base class for stochastic multi operators.")]
+  [Item("StochasticMultiOperator<T>", "Base class for stochastic multi operators.")]
   [StorableClass]
   public abstract class StochasticMultiOperator<T> : MultiOperator<T> where T : class, IOperator {
 …
     protected StochasticMultiOperator(bool deserializing) : base(deserializing) { }
     /// <summary>
     /// Initializes a new instance of <see cref="StochasticMultiBranch"/> with two parameters
+    /// Initializes a new instance of <see cref="StochasticMultiOperator"/> with two parameters
     /// (<c>Probabilities</c> and <c>Random</c>).
     /// </summary>
 …
       DoubleArray probabilities = ProbabilitiesParameter.ActualValue;
       if(probabilities.Length != Operators.Count) {
         throw new InvalidOperationException("MultiCrossover: The list of probabilities has to match the number of operators");
+        throw new InvalidOperationException(Name + ": The list of probabilities has to match the number of operators");
+      }
       double sum = 0;

Note: See TracChangeset for help on using the changeset viewer.