Changeset 12747


Ignore:
Timestamp:
07/12/15 16:00:20 (6 years ago)
Author:
ascheibe
Message:

#2427 merged r12743 into stable

Location:
stable
Files:
7 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

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

    r12737 r12747  
    5858          Operators.Add((ILinearLinkageManipulator)Activator.CreateInstance(type), true);
    5959      }
    60       Operators.SetItemCheckedState(Operators.OfType<SwapItemManipulator>().First(), false);
    61       Operators.SetItemCheckedState(Operators.OfType<GraftManipulator>().First(), false);
    6260      SelectedOperatorParameter.ActualName = "SelectedManipulationOperator";
    6361    }
  • stable/HeuristicLab.Optimizer

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

    r12742 r12747  
    146146    <EmbeddedResource Include="Documents\GridSearch_SVM_Regression_Script.hl" />
    147147    <EmbeddedResource Include="Documents\VNS_OP.hl" />
     148    <EmbeddedResource Include="Documents\GA_Grouping.hl" />
    148149    <None Include="Plugin.cs.frame" />
    149150    <Compile Include="OptimizerSingleDocumentMainForm.cs">
  • stable/HeuristicLab.Optimizer/3.3/StartPage.cs

    r12742 r12747  
    6565        using (Stream stream = assembly.GetManifestResourceStream(typeof(StartPage), "Documents.FirstSteps.rtf"))
    6666          firstStepsRichTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
    67       }
    68       catch (Exception) { }
     67      } catch (Exception) { }
    6968
    7069      samplesListView.Enabled = false;
     
    112111
    113112        OnAllSamplesLoaded();
    114       }
    115       finally {
     113      } finally {
    116114        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
    117115      }
     
    126124          OnSampleLoaded(item, group, 1.0 / count);
    127125        }
    128       }
    129       catch (Exception) {
    130       }
    131       finally {
     126      } catch (Exception) {
     127      } finally {
    132128        if (File.Exists(path)) {
    133129          File.Delete(path); // make sure we remove the temporary file
     
    137133
    138134    private void FillGroupLookup() {
    139       var standardProblems = new List<string> { "ES_Griewank", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
     135      var standardProblems = new List<string> { "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
    140136                "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
    141137                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP" ,"VNS_TSP"
     
    185181          mainForm.SetWaitCursor();
    186182          mainForm.ShowContent((IContent)((IItem)samplesListView.SelectedItems[0].Tag).Clone());
    187         }
    188         finally {
     183        } finally {
    189184          mainForm.ResetWaitCursor();
    190185        }
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r12742 r12747  
    189189      <Private>False</Private>
    190190      <HintPath>..\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     191    </Reference>
     192    <Reference Include="HeuristicLab.Encodings.LinearLinkageEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     193      <SpecificVersion>False</SpecificVersion>
     194      <HintPath>..\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.dll</HintPath>
    191195    </Reference>
    192196    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     
    422426    <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
    423427    <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
     428    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
    424429    <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
    425430    <Compile Include="HeuristicLab-3.3\Samples\EsGriewankSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.