Changeset 1646 for trunk

Timestamp:

04/24/09 10:16:58 (16 years ago)

Author:

dtraxing

Message:

Renamed HeuristicLab.SGAHardWired Plugin to HeuristicLab.FixedOperators. (ticket #580)

Location:

trunk/sources

Files:

• HeuristicLab.FixedOperators (moved) (moved from trunk/sources/HeuristicLab.SGA.Hardwired)
• HeuristicLab.FixedOperators/3.2/CreateChildren.cs (modified) (2 diffs)
• HeuristicLab.FixedOperators/3.2/CreateChildrenHardWired.cs (modified) (2 diffs)
• HeuristicLab.FixedOperators/3.2/CreateReplacement.cs (modified) (2 diffs)
• HeuristicLab.FixedOperators/3.2/FixedSGAMain.cs (copied) (copied from trunk/sources/HeuristicLab.SGA.Hardwired/3.2/SGAMainWithHWControllStructures.cs) (6 diffs)
• HeuristicLab.FixedOperators/3.2/HeuristicLab.FixedOperators-3.2.csproj (copied) (copied from trunk/sources/HeuristicLab.SGA.Hardwired/3.2/HeuristicLab.SGA.Hardwired-3.2.csproj) (2 diffs)
• HeuristicLab.FixedOperators/3.2/HeuristicLab.SGA.Hardwired-3.2.csproj (deleted)
• HeuristicLab.FixedOperators/3.2/HeuristicLabFixedOperatorsPlugin.cs (copied) (copied from trunk/sources/HeuristicLab.SGA.Hardwired/3.2/HeuristicLabSGAHardwiredPlugin.cs) (2 diffs)
• HeuristicLab.FixedOperators/3.2/HeuristicLabSGAHardwiredPlugin.cs (deleted)
• HeuristicLab.FixedOperators/3.2/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.FixedOperators/3.2/SGAMainWithHWControllStructures.cs (deleted)
• HeuristicLab.sln (modified) (3 diffs)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)

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

@@ -31 +31 @@
 using HeuristicLab.Routing.TSP;
 
-namespace HeuristicLab.SGA.Hardwired {
+namespace HeuristicLab.FixedOperators {
   class CreateChildren : OperatorBase {
     ChildrenInitializer ci;
@@ -95 +95 @@
     } // Apply
   } // class CreateChildren
-} // namespace HeuristicLab.SGA.Hardwired
+} // namespace HeuristicLab.FixedOperators

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

@@ -31 +31 @@
 using HeuristicLab.Routing.TSP;
 
-namespace HeuristicLab.SGA.Hardwired {
+namespace HeuristicLab.FixedOperators {
   class CreateChildrenHardWired : OperatorBase {
     ChildrenInitializer ci;
@@ -120 +120 @@
     } // Apply
   } // class CreateChildrenHardWired
-} // namespace HeuristicLab.SGA.Hardwired
+} // namespace HeuristicLab.FixedOperators

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

@@ -33 +33 @@
 using System.Collections;
 
-namespace HeuristicLab.SGA.Hardwired {
+namespace HeuristicLab.FixedOperators {
   class CreateReplacement : OperatorBase {
     LeftSelector ls;
@@ -83 +83 @@
     } // Apply
   } // class CreateReplacement
-} // namespace HeuristicLab.SGA.Hardwired
+} // namespace HeuristicLab.FixedOperators

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

@@ -33 +33 @@
 using System.Diagnostics;
 
-namespace HeuristicLab.SGA.Hardwired {
-  class SGAMainWithHWControllStructures : CombinedOperator {
+namespace HeuristicLab.FixedOperators {
+  class FixedSGAMain : CombinedOperator {
     public override string Description {
       get { return @"Implements the SGAMain with hardwired control structures. Operators are delegated."; }
@@ -49 +49 @@
     DoubleData probability;
 
-    public SGAMainWithHWControllStructures()
+    long[] timesExecuteCreateChildren;
+
+    public FixedSGAMain()
       : base() {
       AddVariableInfo(new VariableInfo("Selector", "Selection strategy for SGA", typeof(OperatorBase), VariableKind.In));
       AddVariableInfo(new VariableInfo("MaximumGenerations", "Maximum number of generations to create", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Generations", "Number of processed generations", typeof(IntData), VariableKind.In | VariableKind.Out));
-      Name = "SGAMainWithHWControllStructures";
-
+      Name = "FixedSGAMain";
       //InitCreateChildrenHWCS();
       InitCreateChildrenHW();
@@ -96 +97 @@
 
     public override IOperation Apply(IScope scope) {
-
+      Stopwatch swApply = new Stopwatch();
+      swApply.Start();
       //base.Apply(scope); // noch nachfragen ob das auch in ordnung wäre
       for (int i = 0; i < SubOperators.Count; i++) {
@@ -134 +136 @@
       IntData evaluatedSolutions = GetVariableValue<IntData>("EvaluatedSolutions", scope, true);
       Stopwatch watch = new Stopwatch();
+      long[] times = new long[10];
+      timesExecuteCreateChildren = new long[10];
       for (int i = 0; i < maxGenerations.Data; i++) {
+          watch.Start();
         selector.Execute(scope);
+        watch.Stop();
+        times[0] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
+        // if uncomment, adapt constructor
         //createChildren.Execute(scope.SubScopes[1]);
         //ExecuteCreateChildrenHWCS(scope.SubScopes[1]);
         ExecuteCreateChildrenHW(scope.SubScopes[1], evaluatedSolutions);
+        watch.Stop();
+        times[1] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         createReplacement.Execute(scope);
+        watch.Stop();
+        times[2] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         ql.Execute(scope);
+        watch.Stop();
+        times[3] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         bawqc.Execute(scope);
+        watch.Stop();
+        times[4] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         dc.Execute(scope);
+        watch.Stop();
+        times[5] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         lci.Execute(scope);
+        watch.Stop();
+        times[6] += watch.ElapsedTicks;
+        watch.Reset();
+        watch.Start();
         nrOfGenerations.Data++;
       }
 
-     
+      swApply.Stop();
+      Console.WriteLine("SGAMain.Apply(): {0}", swApply.Elapsed);
       return null;
     } // Apply
 
+    /// <summary>
+    /// Initializes some variables needed before the execution of create children
+    /// </summary>
+    /// <param name="scope"></param>
     private void InitializeExecuteCreateChildren(IScope scope) {
       crossover = (OperatorBase)GetVariableValue("Crossover", scope, true);
@@ -180 +219 @@
 
     private void ExecuteCreateChildrenHW(IScope scope, IntData evaluatedSolutions){
+      //Stopwatch watch = new Stopwatch();
+      //long[] times = new long[10];
       // ChildrenInitializer
+      //watch.Start();
       ci.Apply(scope);
+      //watch.Stop();
+      //timesExecuteCreateChildren[0] += watch.ElapsedTicks;
+      //watch.Reset();
       // UniformSequentialSubScopesProcessor
       foreach (IScope s in scope.SubScopes) {
+        //watch.Start();
         if (crossover.Execute(s) != null)
           throw new InvalidOperationException("ERROR: no support for combined operators!");
+        //watch.Stop();
+        //timesExecuteCreateChildren[1] += watch.ElapsedTicks;
+        //watch.Reset();
+
 
         // Stochastic Branch
         if (random.NextDouble() < probability.Data) {
+          //watch.Start();
           if (mutator.Execute(s) != null)
             throw new InvalidOperationException("ERROR: no support for combined operators!");
+          //watch.Stop();
+          //timesExecuteCreateChildren[2] += watch.ElapsedTicks;
+          //watch.Reset();
+
         }
 
+        //watch.Start();
         if (evaluator.Execute(s) != null)
           throw new InvalidOperationException("ERROR: no support for combined operators!");
+        //watch.Stop();
+        //timesExecuteCreateChildren[3] += watch.ElapsedTicks;
+        //watch.Reset();
 
         // subscopes remover
+        //watch.Start();
         while (s.SubScopes.Count > 0)
           s.RemoveSubScope(s.SubScopes[0]);
+        //watch.Stop();
+        //timesExecuteCreateChildren[4] += watch.ElapsedTicks;
+        //watch.Reset();
 
         evaluatedSolutions.Data++;
@@ -204 +267 @@
 
       // sort scopes
-      //bool descending = GetVariableValue<BoolData>("Maximization", scope, true).Data;
-      //double[] keys = new double[scope.SubScopes.Count];
-      //int[] sequence = new int[keys.Length];
-
-      //for (int i = 0; i < keys.Length; i++) {
-      //  keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
-      //  sequence[i] = i;
-      //}
-
-      //Array.Sort<double, int>(keys, sequence);
-
-      //if (descending) {
-      //  int temp;
-      //  for (int i = 0; i < sequence.Length / 2; i++) {
-      //    temp = sequence[i];
-      //    sequence[i] = sequence[sequence.Length - 1 - i];
-      //    sequence[sequence.Length - 1 - i] = temp;
-      //  }
-      //}
-      //scope.ReorderSubScopes(sequence);
+      bool descending = GetVariableValue<BoolData>("Maximization", scope, true).Data;
+
+      double[] keys = new double[scope.SubScopes.Count];
+      int[] sequence = new int[keys.Length];
+
+      for (int i = 0; i < keys.Length; i++) {
+        keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
+        sequence[i] = i;
+      }
+
+      Array.Sort<double, int>(keys, sequence);
+
+      if (descending) {
+        int temp;
+        for (int i = 0; i < sequence.Length / 2; i++) {
+          temp = sequence[i];
+          sequence[i] = sequence[sequence.Length - 1 - i];
+          sequence[sequence.Length - 1 - i] = temp;
+        }
+      }
+      scope.ReorderSubScopes(sequence);
+      //watch.Stop();
+      //timesExecuteCreateChildren[5] += watch.ElapsedTicks;
+      //watch.Reset();
 
       return;
-    }
-
-  } // class SGAMainWithHWControllStructures
-} // namespace HeuristicLab.SGA.Hardwired
+    } // ExecuteCreateChildrenHW
+
+  } // class FixedSGAMain
+} // namespace HeuristicLab.FixedOperators

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

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.SGA.Hardwired</RootNamespace>
-    <AssemblyName>HeuristicLab.SGA.Hardwired-3.2</AssemblyName>
+    <RootNamespace>HeuristicLab.FixedOperators</RootNamespace>
+    <AssemblyName>HeuristicLab.FixedOperators-3.2</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -70 +70 @@
     <Compile Include="CreateReplacement.cs" />
     <Compile Include="CreateChildrenHardWired.cs" />
-    <Compile Include="HeuristicLabSGAHardwiredPlugin.cs" />
+    <Compile Include="FixedSGAMain.cs" />
+    <Compile Include="HeuristicLabFixedOperatorsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CreateChildren.cs" />
-    <Compile Include="SGAMainWithHWControllStructures.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.SGA.Hardwired {
+namespace HeuristicLab.FixedOperators {
   /// <summary>
-  /// Plugin class for HeuristicLab.SGA.Hardwired plugin.
+  /// Plugin class for HeuristicLab.FixedOperators plugin.
   /// </summary>
-  [ClassInfo(Name = "HeuristicLab.SGA.Hardwired-3.2")]
-  [PluginFile(Filename = "HeuristicLab.SGA.Hardwired-3.2.dll", Filetype = PluginFileType.Assembly)]
+  [ClassInfo(Name = "HeuristicLab.FixedOperators-3.2")]
+  [PluginFile(Filename = "HeuristicLab.FixedOperators-3.2.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
@@ -39 +39 @@
   [Dependency(Dependency = "HeuristicLab.Logging-3.2")]
   [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
-  public class HeuristicLabSGAHardwiredPlugin : PluginBase {
+  public class HeuristicLabFixedOperatorsPlugin : PluginBase {
   }
 }

trunk/sources/HeuristicLab.FixedOperators/3.2/Properties/AssemblyInfo.frame

@@ -28 +28 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.SGA.Hardwired")]
+[assembly: AssemblyTitle("HeuristicLab.FixedOperators")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("FH-Hagenberg")]
-[assembly: AssemblyProduct("HeuristicLab.SGA.Hardwired")]
+[assembly: AssemblyProduct("HeuristicLab.FixedOperators")]
 [assembly: AssemblyCopyright("Copyright © FH-Hagenberg 2009")]
 [assembly: AssemblyTrademark("")]

trunk/sources/HeuristicLab.sln

@@ -161 +161 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tracing-3.2", "HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj", "{EE2034D9-6E27-48A1-B855-42D45F69A4FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA.Hardwired-3.2", "HeuristicLab.SGA.Hardwired\3.2\HeuristicLab.SGA.Hardwired-3.2.csproj", "{583705E2-B1F7-42B8-8149-96E7AECA171A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.UnitTest", "HeuristicLab.Persistence\UnitTests\HeuristicLab.Persistence.UnitTest.csproj", "{BF7D9494-A586-457B-8DF9-ED599F9E6A71}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Security.ADODataAccess-3.2", "HeuristicLab.Security.ADODataAccess\3.2\HeuristicLab.Security.ADODataAccess-3.2.csproj", "{FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.FixedOperators-3.2", "HeuristicLab.FixedOperators\3.2\HeuristicLab.FixedOperators-3.2.csproj", "{583705E2-B1F7-42B8-8149-96E7AECA171A}"
 EndProject
 Global
@@ -2421 +2421 @@
     {EE2034D9-6E27-48A1-B855-42D45F69A4FC}.Visualization Debug|x86.ActiveCfg = Debug|x86
     {EE2034D9-6E27-48A1-B855-42D45F69A4FC}.Visualization Debug|x86.Build.0 = Debug|x86
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|x86.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|x64.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|x86.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|Any CPU.Build.0 = Release|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|x64.ActiveCfg = Release|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|x86.ActiveCfg = Release|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
-    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
     {BF7D9494-A586-457B-8DF9-ED599F9E6A71}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {BF7D9494-A586-457B-8DF9-ED599F9E6A71}.CEDMA Debug|x64.ActiveCfg = Debug|x64
@@ -2476 +2456 @@
     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|x64.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.GP Debug|x86.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|x64.ActiveCfg = Release|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Release|x86.ActiveCfg = Release|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
+    {583705E2-B1F7-42B8-8149-96E7AECA171A}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab/CopyAssemblies.cmd

@@ -74 +74 @@
 copy "%SolutionDir%\HeuristicLab.SequentialEngine\3.2\%Outdir%\HeuristicLab.SequentialEngine-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SGA\3.2\%Outdir%\HeuristicLab.SGA-3.2.dll" .\plugins
-copy "%SolutionDir%\HeuristicLab.SGA.Hardwired\3.3\%Outdir%\HeuristicLab.SGA.Hardwired-3.3.dll" .\plugins
+copy "%SolutionDir%\HeuristicLab.FixedOperators\3.2\%Outdir%\HeuristicLab.FixedOperators-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SimOpt\3.2\%Outdir%\HeuristicLab.SimOpt-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SQLite\3.2\%Outdir%\HeuristicLab.SQLite-3.2.dll" .\plugins