Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ParticleSwarmOptimization

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

@@ -64 +64 @@
       get { return (IValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    public ConstrainedValueParameter<IParticleCreator> ParticleCreatorParameter {
-      get { return (ConstrainedValueParameter<IParticleCreator>)Parameters["ParticleCreator"]; }
-    }
-    public ConstrainedValueParameter<IParticleUpdater> ParticleUpdaterParameter {
-      get { return (ConstrainedValueParameter<IParticleUpdater>)Parameters["ParticleUpdater"]; }
-    }
-    public OptionalConstrainedValueParameter<ITopologyInitializer> TopologyInitializerParameter {
-      get { return (OptionalConstrainedValueParameter<ITopologyInitializer>)Parameters["TopologyInitializer"]; }
-    }
-    public OptionalConstrainedValueParameter<ITopologyUpdater> TopologyUpdaterParameter {
-      get { return (OptionalConstrainedValueParameter<ITopologyUpdater>)Parameters["TopologyUpdater"]; }
-    }
-    public OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> InertiaUpdaterParameter {
-      get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["InertiaUpdater"]; }
-    }
-    public ConstrainedValueParameter<ISwarmUpdater> SwarmUpdaterParameter {
-      get { return (ConstrainedValueParameter<ISwarmUpdater>)Parameters["SwarmUpdater"]; }
+    public IConstrainedValueParameter<IParticleCreator> ParticleCreatorParameter {
+      get { return (IConstrainedValueParameter<IParticleCreator>)Parameters["ParticleCreator"]; }
+    }
+    public IConstrainedValueParameter<IParticleUpdater> ParticleUpdaterParameter {
+      get { return (IConstrainedValueParameter<IParticleUpdater>)Parameters["ParticleUpdater"]; }
+    }
+    public IConstrainedValueParameter<ITopologyInitializer> TopologyInitializerParameter {
+      get { return (IConstrainedValueParameter<ITopologyInitializer>)Parameters["TopologyInitializer"]; }
+    }
+    public IConstrainedValueParameter<ITopologyUpdater> TopologyUpdaterParameter {
+      get { return (IConstrainedValueParameter<ITopologyUpdater>)Parameters["TopologyUpdater"]; }
+    }
+    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> InertiaUpdaterParameter {
+      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["InertiaUpdater"]; }
+    }
+    public IConstrainedValueParameter<ISwarmUpdater> SwarmUpdaterParameter {
+      get { return (IConstrainedValueParameter<ISwarmUpdater>)Parameters["SwarmUpdater"]; }
 
     }

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.ParticleSwarmOptimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.ParticleSwarmOptimization", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Algorithms.ParticleSwarmOptimization", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Properties/AssemblyInfo.cs.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll