Changeset 3659 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding

Timestamp:

05/06/10 00:47:32 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• removed SubScopesSubScopesLookupParameter
• adapted SubScopesLookupParameter and renamed it into ScopeTreeLookupParameter

Location:

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3

Files:

• Crossovers/BlendAlphaBetaCrossover.cs (modified) (2 diffs)
• Crossovers/HeuristicCrossover.cs (modified) (2 diffs)
• Crossovers/MultiRealVectorCrossover.cs (modified) (1 diff)
• RealVectorCrossover.cs (modified) (2 diffs)
• StrategyParameters/StdDevStrategyVectorCrossover.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/BlendAlphaBetaCrossover.cs

@@ -50 +50 @@
     /// The quality of the parents.
     /// </summary>
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
+      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
     /// <summary>
@@ -73 +73 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "Whether the problem is a maximization problem or not."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality values of the parents."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality values of the parents."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("Alpha", "The value for alpha.", new DoubleValue(0.75)));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("Beta", "The value for beta.", new DoubleValue(0.25)));

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/HeuristicCrossover.cs

@@ -47 +47 @@
     /// The quality of the parents.
     /// </summary>
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
+      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
 
@@ -58 +58 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "Whether the problem is a maximization problem or not."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality values of the parents."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality values of the parents."));
     }
 

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/MultiRealVectorCrossover.cs

@@ -55 +55 @@
     public MultiRealVectorCrossover()
       : base() {
-      Parameters.Add(new SubScopesLookupParameter<RealVector>("Parents", "The parent real vector which should be crossed."));
+      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Parents", "The parent real vector which should be crossed."));
       ParentsParameter.ActualName = "RealVector";
       Parameters.Add(new LookupParameter<RealVector>("Child", "The child real vector resulting from the crossover."));

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorCrossover.cs

@@ -43 +43 @@
     }
     public ILookupParameter<ItemArray<RealVector>> ParentsParameter {
-      get { return (SubScopesLookupParameter<RealVector>)Parameters["Parents"]; }
+      get { return (ScopeTreeLookupParameter<RealVector>)Parameters["Parents"]; }
     }
     public ILookupParameter<RealVector> ChildParameter {
@@ -55 +55 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic crossover operators."));
-      Parameters.Add(new SubScopesLookupParameter<RealVector>("Parents", "The parent vectors which should be crossed."));
+      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Parents", "The parent vectors which should be crossed."));
       Parameters.Add(new LookupParameter<RealVector>("Child", "The child vector resulting from the crossover."));
       Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds of the real vector."));

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/StrategyParameters/StdDevStrategyVectorCrossover.cs

@@ -48 +48 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new SubScopesLookupParameter<RealVector>("ParentStrategyParameter", "The strategy parameters to cross."));
+      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("ParentStrategyParameter", "The strategy parameters to cross."));
       Parameters.Add(new LookupParameter<RealVector>("StrategyParameter", "The crossed strategy parameter."));
       ParentsParameter.ActualName = "StrategyParameter";