Changeset 15625 for branches

Timestamp:

01/17/18 13:30:33 (7 years ago)

Author:

abeham

Message:

#2654: implemented generic context-based genetic algorithm

Location:

branches/ContextAlgorithms

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Model2 (added)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Model2/GeneticAlgorithm.cs (added)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Model2/SolutionScope.cs (added)
• HeuristicLab.Core/3.3/Scope.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.resx (added)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Model2 (added)
• HeuristicLab.Optimization/3.3/Model2/Algorithms (added)
• HeuristicLab.Optimization/3.3/Model2/Algorithms/ContextAlgorithm.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Algorithms/StochasticAlgorithm.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Contexts (added)
• HeuristicLab.Optimization/3.3/Model2/Contexts/BasicContext.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Contexts/PopulationContext.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Contexts/SingleSolutionContext.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Contexts/StochasticContext.cs (added)
• HeuristicLab.Optimization/3.3/Model2/Interfaces.cs (added)
• HeuristicLab.Optimization/3.3/Model2/SingleObjectiveSolutionScope.cs (added)

branches/ContextAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj

@@ -115 +115 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Model2\SolutionScope.cs" />
+    <Compile Include="Model2\GeneticAlgorithm.cs" />
     <Compile Include="GeneticAlgorithm.cs" />
     <Compile Include="GeneticAlgorithmMainLoop.cs" />

branches/ContextAlgorithms/HeuristicLab.Core/3.3/Scope.cs

@@ -31 +31 @@
   [Item("Scope", "A scope which contains variables and sub-scopes.")]
   [StorableClass]
-  public sealed class Scope : NamedItem, IScope {
+  public class Scope : NamedItem, IScope {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.OrgChart; }
@@ -60 +60 @@
 
     [StorableConstructor]
-    private Scope(bool deserializing) : base(deserializing) { }
-    private Scope(Scope original, Cloner cloner)
+    protected Scope(bool deserializing) : base(deserializing) { }
+    protected Scope(Scope original, Cloner cloner)
       : base(original, cloner) {
       if (original.variables.Count > 0) variables = cloner.Clone(original.variables);
@@ -118 +118 @@
 
     #region SubScopes Events
-    private void RegisterSubScopesEvents() {
+    protected virtual void RegisterSubScopesEvents() {
       if (subScopes != null) {
         subScopes.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsAdded);
@@ -126 +126 @@
       }
     }
-    private void SubScopes_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
+    protected virtual void SubScopes_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
       foreach (IndexedItem<IScope> item in e.Items)
         item.Value.Parent = this;
     }
-    private void SubScopes_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
+    protected virtual void SubScopes_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
       foreach (IndexedItem<IScope> item in e.Items)
         item.Value.Parent = null;
     }
-    private void SubScopes_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
+    protected virtual void SubScopes_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
       foreach (IndexedItem<IScope> oldItem in e.OldItems)
         oldItem.Value.Parent = null;
@@ -140 +140 @@
         item.Value.Parent = this;
     }
-    private void SubScopes_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
+    protected virtual void SubScopes_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IScope>> e) {
       foreach (IndexedItem<IScope> oldItem in e.OldItems)
         oldItem.Value.Parent = null;

branches/ContextAlgorithms/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -156 +156 @@
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
+    <Compile Include="Model2\Algorithms\ContextAlgorithm.cs" />
+    <Compile Include="Model2\Algorithms\StochasticAlgorithm.cs" />
+    <Compile Include="Model2\Contexts\BasicContext.cs" />
+    <Compile Include="Model2\Contexts\PopulationContext.cs" />
+    <Compile Include="Model2\Contexts\SingleSolutionContext.cs" />
+    <Compile Include="Model2\Contexts\StochasticContext.cs" />
+    <Compile Include="Model2\Interfaces.cs" />
+    <Compile Include="Model2\SingleObjectiveSolutionScope.cs" />
     <Compile Include="MultiObjective\DominationCalculator.cs" />
     <Compile Include="Results\IResultParameter.cs" />
@@ -312 +320 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
+      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
+      <Name>HeuristicLab.Random-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>