Changeset 12747

Timestamp:

07/12/15 16:00:20 (9 years ago)

Author:

ascheibe

Message:

#2427 merged r12743 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/MultiLLEManipulator.cs (modified) (1 diff)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (5 diffs)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)

stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/MultiLLEManipulator.cs

@@ -58 +58 @@
           Operators.Add((ILinearLinkageManipulator)Activator.CreateInstance(type), true);
       }
-      Operators.SetItemCheckedState(Operators.OfType<SwapItemManipulator>().First(), false);
-      Operators.SetItemCheckedState(Operators.OfType<GraftManipulator>().First(), false);
       SelectedOperatorParameter.ActualName = "SelectedManipulationOperator";
     }

stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -146 +146 @@
     <EmbeddedResource Include="Documents\GridSearch_SVM_Regression_Script.hl" />
     <EmbeddedResource Include="Documents\VNS_OP.hl" />
+    <EmbeddedResource Include="Documents\GA_Grouping.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">

stable/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -65 +65 @@
         using (Stream stream = assembly.GetManifestResourceStream(typeof(StartPage), "Documents.FirstSteps.rtf"))
           firstStepsRichTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
-      }
-      catch (Exception) { }
+      } catch (Exception) { }
 
       samplesListView.Enabled = false;
@@ -112 +111 @@
 
         OnAllSamplesLoaded();
-      }
-      finally {
+      } finally {
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
       }
@@ -126 +124 @@
           OnSampleLoaded(item, group, 1.0 / count);
         }
-      }
-      catch (Exception) {
-      }
-      finally {
+      } catch (Exception) {
+      } finally {
         if (File.Exists(path)) {
           File.Delete(path); // make sure we remove the temporary file
@@ -137 +133 @@
 
     private void FillGroupLookup() {
-      var standardProblems = new List<string> { "ES_Griewank", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
+      var standardProblems = new List<string> { "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
                 "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
                 "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP" ,"VNS_TSP"
@@ -185 +181 @@
           mainForm.SetWaitCursor();
           mainForm.ShowContent((IContent)((IItem)samplesListView.SelectedItems[0].Tag).Clone());
-        }
-        finally {
+        } finally {
           mainForm.ResetWaitCursor();
         }

stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -189 +189 @@
       <Private>False</Private>
       <HintPath>..\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.LinearLinkageEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
@@ -422 +426 @@
     <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
     <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\EsGriewankSampleTest.cs" />