Changeset 46

Timestamp:

03/05/08 20:56:34 (16 years ago)

Author:

swagner

Message:

Closed ticket #46

• renamed MultiHeuristicBranch to StochasticMultiBranch
• added description and license information

Location:

trunk/sources/HeuristicLab.Operators

Files:

• HeuristicLab.Operators.csproj (modified) (1 diff)
• StochasticMultiBranch.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/MultiHeuristicBranch.cs) (4 diffs)

trunk/sources/HeuristicLab.Operators/HeuristicLab.Operators.csproj

@@ -58 +58 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MultiHeuristicBranch.cs" />
+    <Compile Include="StochasticMultiBranch.cs" />
     <Compile Include="SubScopesMixer.cs" />
     <Compile Include="DataCollector.cs" />

trunk/sources/HeuristicLab.Operators/StochasticMultiBranch.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
@@ -6 +27 @@
 
 namespace HeuristicLab.Operators {
-  public class MultiHeuristicBranch: OperatorBase {
-    public MultiHeuristicBranch()
+  public class StochasticMultiBranch : OperatorBase {
+    public override string Description {
+      get { return @"TODO\r\nOperator description still missing ..."; }
+    }
+
+    public StochasticMultiBranch()
       : base() {
-
       AddVariableInfo(new VariableInfo("Probabilities", "The probabilities, that define how likely each suboperator/graph is executed. This array must sum to 1", typeof(DoubleArrayData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Random", "The pseudo random-generator, used for any random-decision.", typeof(IRandom), VariableKind.In));
@@ -18 +42 @@
       DoubleArrayData probabilities = GetVariableValue<DoubleArrayData>("Probabilities", scope, true);
       if(probabilities.Data.Length != SubOperators.Count) {
-        throw new InvalidOperationException("MultiHeuristicBranch: The list of probabilities has to match the number of operators");
+        throw new InvalidOperationException("StochasticMultiBranch: The list of probabilities has to match the number of operators");
       }
       double sum = 0;
@@ -35 +59 @@
       }
       if(successor == null) {
-        throw new InvalidOperationException("MultiHeuristicBranch: There was a problem with the list of probabilities");
+        throw new InvalidOperationException("StochasticMultiBranch: There was a problem with the list of probabilities");
       }
       return new AtomicOperation(successor, scope);