Changeset 5440

Timestamp:

02/05/11 00:01:18 (13 years ago)

Author:

abeham

Message:

#852

• Fixed wiring of VelocityBoundsModifier again (on second thought a "real" wiring is not really necessary)
• Added PSO as dependency to the main project

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/IDiscreteDoubleMatrixModifier.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/VelocityBoundsModifier.cs (modified) (4 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -92 +92 @@
     {00814351-4AB8-4088-9B99-F62787B89E93} = {00814351-4AB8-4088-9B99-F62787B89E93}
     {3EAF1454-086D-44A2-8509-B1BA24DB1865} = {3EAF1454-086D-44A2-8509-B1BA24DB1865}
+    {2C429157-9C34-4DD3-9D5F-B444B751E39A} = {2C429157-9C34-4DD3-9D5F-B444B751E39A}
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}
     {DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6} = {DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/IDiscreteDoubleMatrixModifier.cs

@@ -28 +28 @@
   public interface IDiscreteDoubleMatrixModifier : IItem {
     ILookupParameter<DoubleMatrix> ValueParameter { get; }
-    IValueLookupParameter<DoubleValue> ScaleParameter { get; }
+    ILookupParameter<DoubleValue> ScaleParameter { get; }
     ConstrainedValueParameter<IDiscreteDoubleValueModifier> ScalingOperatorParameter { get; }
     IValueLookupParameter<DoubleValue> StartValueParameter { get; }

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/VelocityBoundsModifier.cs

@@ -37 +37 @@
       get { return (ILookupParameter<DoubleMatrix>)Parameters["Matrix"]; }
     }
-    public IValueLookupParameter<DoubleValue> ScaleParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["Scale"]; }
+    public ILookupParameter<DoubleValue> ScaleParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Scale"]; }
     }
     public ConstrainedValueParameter<IDiscreteDoubleValueModifier> ScalingOperatorParameter {
@@ -64 +64 @@
     [StorableConstructor]
     private VelocityBoundsModifier(bool deserializing) : base(deserializing) { }
-    private VelocityBoundsModifier(VelocityBoundsModifier original, Cloner cloner)
-      : base(original, cloner) {
-      ParameterizeModifiers();
-    }
+    private VelocityBoundsModifier(VelocityBoundsModifier original, Cloner cloner) : base(original, cloner) { }
     public VelocityBoundsModifier() {
       Parameters.Add(new LookupParameter<DoubleMatrix>("Matrix", "The double matrix to modify."));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Scale", "Scale parameter."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Scale", "Scale parameter."));
       Parameters.Add(new ConstrainedValueParameter<IDiscreteDoubleValueModifier>("ScalingOperator", "Modifies the value"));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("StartValue", "The start value of 'Value'.", new DoubleValue(1)));
@@ -79 +76 @@
 
       Initialize();
-      ParameterizeModifiers();
     }
 
@@ -87 +83 @@
     #endregion
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      ParameterizeModifiers();
-    }
-
     private void Initialize() {
       foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>()) {
         ScalingOperatorParameter.ValidValues.Add(op);
-      }
-    }
-
-    private void ParameterizeModifiers() {
-      foreach (IDiscreteDoubleValueModifier op in ScalingOperatorParameter.ValidValues) {
         op.ValueParameter.ActualName = ScaleParameter.Name;
         op.StartValueParameter.ActualName = StartValueParameter.Name;