Changeset 3568 for trunk

Timestamp:

04/30/10 10:28:32 (15 years ago)

Author:

gkronber

Message:

Changed MultiOperator and MultiOperatorView to hold the list of operators in a CheckedItemList and display the list in a CheckedItemListView. #992

Location:

trunk/sources

Files:

• HeuristicLab.Operators.Views/3.3/MultiOperatorView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/StochasticMultiOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators.Views/3.3/MultiOperatorView.Designer.cs

@@ -47 +47 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.operatorsTabPage = new System.Windows.Forms.TabPage();
-      this.operatorListView = new HeuristicLab.Core.Views.ItemListView<T>();
+      this.operatorListView = new HeuristicLab.Core.Views.CheckedItemListView<T>();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
@@ -178 +178 @@
     protected System.Windows.Forms.TabPage parametersTabPage;
     protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
-    protected HeuristicLab.Core.Views.ItemListView<T> operatorListView;
+    protected HeuristicLab.Core.Views.CheckedItemListView<T> operatorListView;
     protected System.Windows.Forms.CheckBox breakpointCheckBox;
     protected System.Windows.Forms.Label breakpointLabel;

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

@@ -39 +39 @@
 
     [Storable]
-    private ItemList<T> operators;
-    public ItemList<T> Operators {
+    private CheckedItemList<T> operators;
+    public CheckedItemList<T> Operators {
       get { return operators; }
     }
@@ -46 +46 @@
     public MultiOperator()
       : base() {
-      operators = new ItemList<T>();
+      operators = new CheckedItemList<T>();
       Initialize();
     }
@@ -65 +65 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       MultiOperator<T> clone = (MultiOperator<T>)base.Clone(cloner);
-      clone.operators = (ItemList<T>)cloner.Clone(operators);
+      clone.operators = (CheckedItemList<T>)cloner.Clone(operators);
       clone.Initialize();
       return clone;

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

@@ -113 +113 @@
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown when the list of probabilites does not
-    /// match the number of operators.</exception>
+    /// match the number of operators, the list of selected operators is empty, 
+    /// or all selected operators have zero probabitlity.</exception>
     /// <returns>A new operation with the operator that was selected followed by the current operator's successor.</returns>
     public override IOperation Apply() {
       IRandom random = RandomParameter.ActualValue;
       DoubleArray probabilities = ProbabilitiesParameter.ActualValue;
-      if(probabilities.Length != Operators.Count) {
+      if (probabilities.Length != Operators.Count) {
         throw new InvalidOperationException(Name + ": The list of probabilities has to match the number of operators");
       }
-      double sum = 0;
-      for (int i = 0; i < Operators.Count; i++) {
-        sum += probabilities[i];
+      var checkedOperators = Operators.CheckedItems;
+      if (checkedOperators.Count() == 0) {
+        throw new InvalidOperationException(Name + ": At least one operator must be checked.");
       }
+      double sum = (from indexedItem in checkedOperators select probabilities[indexedItem.Index]).Sum();
+      if (sum == 0) throw new InvalidOperationException(Name + ": All selected operators have zero probability.");
       double r = random.NextDouble() * sum;
       sum = 0;
       IOperator successor = null;
-      for(int i = 0; i < Operators.Count; i++) {
-        sum += probabilities[i];
-        if(sum > r) {
-          successor = Operators[i];
+      foreach (var indexedItem in checkedOperators) {
+        sum += probabilities[indexedItem.Index];
+        if (sum > r) {
+          successor = indexedItem.Value;
           break;
         }