Changeset 2150 for trunk/sources/HeuristicLab.FixedOperators

Timestamp:

07/08/09 10:24:40 (15 years ago)

Author:

dtraxing

Message:

added fixed operator for SteadyStateOSGA
FixedOSGAMain: fixed a type in the name; removed catch block to in Apply method
FixedGAMainBase: add virtual and protected modifier to InitReplacement and DoReplacement
(ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• FixedGAMainBase.cs (modified) (2 diffs)
• FixedOSGAMain.cs (modified) (2 diffs)
• FixedSteadyStateOSGAMain.cs (added)
• HeuristicLab.FixedOperators-3.2.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.FixedOperators/3.2/FixedGAMainBase.cs

@@ -87 +87 @@
     } // FixedGABase
 
-    private void InitReplacement() {
+    protected virtual void InitReplacement() {
       ls = new LeftSelector();
       rr = new RightReducer();
@@ -170 +170 @@
     } // GetOperatorsFromScope
 
-    protected void DoReplacement(IScope scope) {
+    protected virtual void DoReplacement(IScope scope) {
       //// SequentialSubScopesProcessor
       Execute(ls, scope.SubScopes[0]);

trunk/sources/HeuristicLab.FixedOperators/3.2/FixedOSGAMain.cs

@@ -37 +37 @@
   class FixedOSGAMain : FixedGAMainBase {
     WeightedOffspringFitnessComparer wofc;
-    OffspringSelector os;
+    protected IOperator os;
 
     public FixedOSGAMain()
       : base() {
-      Name = "FixeOSGAMain";
+      Name = "FixedOSGAMain";
       wofc = new WeightedOffspringFitnessComparer();
       os = new OffspringSelector();
@@ -144 +144 @@
         return new AtomicOperation(this, scope);
       }
-      catch (Exception ex) {
-        ex.ToString();
-      }
 
       return null;

trunk/sources/HeuristicLab.FixedOperators/3.2/HeuristicLab.FixedOperators-3.2.csproj

@@ -106 +106 @@
     <Compile Include="HeuristicLabFixedOperatorsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="FixedSteadyStateOSGAMain.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -163 +164 @@
       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
       <Name>HeuristicLab.Logging-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators.Programmable\3.2\HeuristicLab.Operators.Programmable-3.2.csproj">
+      <Project>{E3CCBFC6-900C-41B6-AFB8-6646DB097435}</Project>
+      <Name>HeuristicLab.Operators.Programmable-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">