Changeset 3378


Ignore:
Timestamp:
04/16/10 23:42:37 (11 years ago)
Author:
abeham
Message:

Added draft of OSGA #976
MainLoop somewhat finished, wiring not

Location:
trunk/sources
Files:
13 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r3373 r3378  
    8080    {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
    8181    {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {BF7D9494-A586-457B-8DF9-ED599F9E6A71}
     82    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}
    8283    {DE12659F-87C4-48E6-B2E3-4E73DD95A540} = {DE12659F-87C4-48E6-B2E3-4E73DD95A540}
    8384    {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F} = {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F}
     
    244245EndProject
    245246Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj", "{799B0B38-E384-4A17-A73C-F211EB854592}"
     247EndProject
     248Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3", "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj", "{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}"
    246249EndProject
    247250Global
     
    13661369    {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x64.ActiveCfg = Release|x64
    13671370    {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x86.ActiveCfg = Release|x86
     1371    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1372    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1373    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|x64.ActiveCfg = Debug|x64
     1374    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|x64.Build.0 = Debug|x64
     1375    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|x86.ActiveCfg = Debug|x86
     1376    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|x86.Build.0 = Debug|x86
     1377    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1378    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|Any CPU.Build.0 = Release|Any CPU
     1379    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x64.ActiveCfg = Release|Any CPU
     1380    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x86.ActiveCfg = Release|Any CPU
     1381    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Services|Any CPU.ActiveCfg = Release|Any CPU
     1382    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Services|Any CPU.Build.0 = Release|Any CPU
     1383    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Services|x64.ActiveCfg = Release|Any CPU
     1384    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Services|x86.ActiveCfg = Release|Any CPU
    13681385  EndGlobalSection
    13691386  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/Properties/AssemblyInfo.frame

    r3078 r3378  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Algorithms.LS")]
     28[assembly: AssemblyTitle("HeuristicLab.Algorithms.LocalSearch")]
    2929[assembly: AssemblyDescription("HeuristicLab local search (LS)")]
    3030[assembly: AssemblyConfiguration("")]
  • trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/Properties/AssemblyInfo.frame

    r3093 r3378  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Algorithms.SA")]
     28[assembly: AssemblyTitle("HeuristicLab.Algorithms.SimulatedAnnealing")]
    2929[assembly: AssemblyDescription("HeuristicLab simulated annealing (SA)")]
    3030[assembly: AssemblyConfiguration("")]
  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/Properties/AssemblyInfo.frame

    r3026 r3378  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Algorithms.TS")]
     28[assembly: AssemblyTitle("HeuristicLab.Algorithms.TabuSearch")]
    2929[assembly: AssemblyDescription("HeuristicLab tabu search (TS)")]
    3030[assembly: AssemblyConfiguration("")]
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r3368 r3378  
    8181  </ItemGroup>
    8282  <ItemGroup>
     83    <Compile Include="OffspringSelector.cs" />
     84    <Compile Include="ParentsQualityComparator.cs" />
    8385    <Compile Include="ProbabilisticQualityComparator.cs" />
    8486    <Compile Include="ResultsCollector.cs" />
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/QualityComparator.cs

    r3376 r3378  
    3131  [Item("QualityComparator", "Compares two qualities and creates a boolean flag that indicates if the left side is better than the right side.")]
    3232  [StorableClass]
    33   public class QualityComparator : SingleSuccessorOperator {
    34     public LookupParameter<DoubleValue> LeftSideParameter {
    35       get { return (LookupParameter<DoubleValue>)Parameters["LeftSide"]; }
     33  public class QualityComparator : SingleSuccessorOperator, IQualityComparator {
     34    public ILookupParameter<DoubleValue> LeftSideParameter {
     35      get { return (ILookupParameter<DoubleValue>)Parameters["LeftSide"]; }
    3636    }
    37     public ValueLookupParameter<DoubleValue> RightSideParameter {
    38       get { return (ValueLookupParameter<DoubleValue>)Parameters["RightSide"]; }
     37    public IValueLookupParameter<DoubleValue> RightSideParameter {
     38      get { return (IValueLookupParameter<DoubleValue>)Parameters["RightSide"]; }
    3939    }
    40     public LookupParameter<BoolValue> ResultParameter {
    41       get { return (LookupParameter<BoolValue>)Parameters["Result"]; }
     40    public ILookupParameter<BoolValue> ResultParameter {
     41      get { return (ILookupParameter<BoolValue>)Parameters["Result"]; }
    4242    }
    43     public ValueLookupParameter<BoolValue> MaximizationParameter {
    44       get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
     43    public IValueLookupParameter<BoolValue> MaximizationParameter {
     44      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
    4545    }
    4646
  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r3356 r3378  
    8888    <Compile Include="BatchRun.cs" />
    8989    <Compile Include="Interfaces\IMigrator.cs" />
     90    <Compile Include="Interfaces\ISubScopesQualityComparator.cs" />
     91    <Compile Include="Interfaces\IQualityComparator.cs" />
    9092    <Compile Include="Interfaces\ISelfAdaptiveManipulator.cs" />
    9193    <Compile Include="Interfaces\IStrategyParameterCrossover.cs" />
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLabProblemsDataAnalysisViewsPlugin.cs

    r3377 r3378  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Views {
    28   [Plugin("HeuristicLab.Problems.DataAnalysis.Views","3.3.0.3376")]
     28  [Plugin("HeuristicLab.Problems.DataAnalysis.Views","3.3.0.3377")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.3.dll", PluginFileType.Assembly)]
    3030  public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase {
Note: See TracChangeset for help on using the changeset viewer.