Changeset 15171


Ignore:
Timestamp:
07/08/17 12:31:54 (2 weeks ago)
Author:
jkarder
Message:

#1853: worked on ParameterConfigurationEncoding

  • updated to .NET 4.5
  • replaced CreateExperimentDialogV2 with CreateExperimentView
  • improved experiment generation
  • fixed plugin dependencies and cleaned project references
Location:
branches/ParameterConfigurationEncoding
Files:
2 added
2 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3

    • Property svn:ignore set to
      Plugin.cs
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj

    r9356 r15171  
    1111    <RootNamespace>HeuristicLab.Encodings.ParameterConfigurationEncoding.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515  </PropertyGroup>
     
    4040  <ItemGroup>
    4141    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     42      <SpecificVersion>False</SpecificVersion>
     43      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    4244      <Private>False</Private>
    4345    </Reference>
    4446    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     47      <SpecificVersion>False</SpecificVersion>
     48      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    4549      <Private>False</Private>
    4650    </Reference>
    4751    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     52      <SpecificVersion>False</SpecificVersion>
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    4854      <Private>False</Private>
    4955    </Reference>
    5056    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     57      <SpecificVersion>False</SpecificVersion>
     58      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    5159      <Private>False</Private>
    5260    </Reference>
    5361    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     62      <SpecificVersion>False</SpecificVersion>
     63      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    5464      <Private>False</Private>
    5565    </Reference>
    5666    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     67      <SpecificVersion>False</SpecificVersion>
     68      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    5769      <Private>False</Private>
    5870    </Reference>
    5971    <Reference Include="HeuristicLab.Data.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     72      <SpecificVersion>False</SpecificVersion>
     73      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
    6074      <Private>False</Private>
    6175    </Reference>
    6276    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     77      <SpecificVersion>False</SpecificVersion>
     78      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    6379      <Private>False</Private>
    6480    </Reference>
    6581    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     82      <SpecificVersion>False</SpecificVersion>
     83      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    6684      <Private>False</Private>
    6785    </Reference>
    6886    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     87      <SpecificVersion>False</SpecificVersion>
     88      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    6989      <Private>False</Private>
    7090    </Reference>
    7191    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     92      <SpecificVersion>False</SpecificVersion>
     93      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    7294      <Private>False</Private>
    7395    </Reference>
    7496    <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     97      <SpecificVersion>False</SpecificVersion>
     98      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
    7599      <Private>False</Private>
    76100    </Reference>
    77101    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    78104      <Private>False</Private>
    79105    </Reference>
    80106    <Reference Include="HeuristicLab.Parameters.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters.Views-3.3.dll</HintPath>
    81109      <Private>False</Private>
    82110    </Reference>
    83111    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <SpecificVersion>False</SpecificVersion>
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    84114      <Private>False</Private>
    85115    </Reference>
    86116    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     117      <SpecificVersion>False</SpecificVersion>
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    87119      <Private>False</Private>
    88120    </Reference>
     
    96128  <ItemGroup>
    97129    <None Include="Plugin.cs.frame" />
    98     <Compile Include="CreateExperimentDialogV2.cs">
    99       <SubType>Form</SubType>
    100     </Compile>
    101     <Compile Include="CreateExperimentDialogV2.Designer.cs">
    102       <DependentUpon>CreateExperimentDialogV2.cs</DependentUpon>
     130    <Compile Include="CreateExperimentView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="CreateExperimentView.Designer.cs">
     134      <DependentUpon>CreateExperimentView.cs</DependentUpon>
    103135    </Compile>
    104136    <Compile Include="MenuItems\CreateExperimentMenuItemV2.cs" />
     
    145177  <ItemGroup>
    146178    <ProjectReference Include="..\..\HeuristicLab.Encodings.ParameterConfigurationEncoding\3.3\HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj">
    147       <Project>{7520D3F4-7526-4BB7-B71E-F41F5D5559F9}</Project>
     179      <Project>{7520d3f4-7526-4bb7-b71e-f41f5d5559f9}</Project>
    148180      <Name>HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3</Name>
    149181      <Private>False</Private>
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/MenuItems/CreateExperimentMenuItemV2.cs

    r8535 r15171  
    2323using System.Collections.Generic;
    2424using System.Windows.Forms;
    25 using HeuristicLab.Core;
    2625using HeuristicLab.MainForm;
    2726using HeuristicLab.Optimization;
    2827using HeuristicLab.Optimizer;
    29 using HeuristicLab.PluginInfrastructure;
    3028
    3129namespace HeuristicLab.Encodings.ParameterConfigurationEncoding.Views {
    3230  public class CreateExperimentMenuItemV2 : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    3331    public override string Name {
    34       get { return "Create Experiment (v2)"; }
     32      get { return "Create E&xperiment (v2)"; }
    3533    }
    3634    public override IEnumerable<string> Structure {
     
    4947    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    5048      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
    51       ToolStripItem.Enabled = (activeView != null) && (activeView.Content != null) && (activeView.Content is IAlgorithm) && !activeView.Locked;
     49      ToolStripItem.Enabled = (activeView != null) && (activeView.Content as IAlgorithm != null) && !activeView.Locked;
    5250    }
    5351
    5452    public override void Execute() {
    55       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
    56       if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IAlgorithm) && !activeView.Locked) {
    57         using (CreateExperimentDialogV2 dialog = new CreateExperimentDialogV2((IAlgorithm)activeView.Content, ApplicationManager.Manager.GetInstances<IEngine>())) {
    58           if (dialog.ShowDialog() == DialogResult.OK) MainFormManager.MainForm.ShowContent(dialog.Experiment);
    59         }
     53      var activeView = MainFormManager.MainForm.ActiveView as IContentView;
     54      if (activeView == null) return;
     55      var algorithm = activeView.Content as IAlgorithm;
     56      if (algorithm == null) return;
     57
     58      if (!activeView.Locked) {
     59        MainFormManager.MainForm.ShowContent(algorithm, typeof(CreateExperimentView));
    6060      }
    6161    }
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/Plugin.cs.frame

    r8524 r15171  
    2828  [Plugin("HeuristicLab.Encodings.ParameterConfigurationEncoding.Views", "3.3.7.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Collections", "3.3")]
    3130  [PluginDependency("HeuristicLab.Common", "3.3")]
    3231  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     
    3938  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    4039  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    41   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4240  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
    43   [PluginDependency("HeuristicLab.Parameters", "3.3")]
    44   [PluginDependency("HeuristicLab.Parameters.Views", "3.3")]
    4541  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4642  public class HeuristicLabEncodingsParameterConfigurationEncodingViewsPlugin : PluginBase {
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

    • Property svn:ignore set to
      Plugin.cs
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ExperimentFactory.cs

    r8574 r15171  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Linq;
    2425using System.Threading;
    2526using HeuristicLab.Optimization;
     
    3233      get { return experimentGenerationProgress; }
    3334      private set {
    34         if (experimentGenerationProgress != value) {
    35           experimentGenerationProgress = value;
    36           OnExperimentGenerationProgressChanged();
    37         }
     35        experimentGenerationProgress = value;
     36        OnExperimentGenerationProgressChanged();
    3837      }
    3938    }
     
    4746    public Experiment GenerateExperiment(IAlgorithm algorithm, ParameterConfigurationTree configuration, bool createBatchRuns, int repetitions, Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> problemInstances, CancellationToken ct) {
    4847      var experiment = new Experiment();
    49       var algorithms = new List<IAlgorithm>(1 + problemInstances.Values.Count) { (IAlgorithm)algorithm.Clone() };
    50       foreach (var provider in problemInstances) {
    51         foreach (var descriptor in provider.Value) {
    52           var alg = (IAlgorithm)algorithm.Clone();
    53           ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
    54           algorithms.Add(alg);
     48      var algorithms = new List<IAlgorithm>();
     49
     50      if (problemInstances.Values.Sum(x => x.Count) > 0) {
     51        foreach (var provider in problemInstances) {
     52          foreach (var descriptor in provider.Value) {
     53            var alg = (IAlgorithm)algorithm.Clone();
     54            ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
     55            algorithms.Add(alg);
     56          }
    5557        }
    56       }
     58      } else algorithms.Add((IAlgorithm)algorithm.Clone());
     59
    5760      ExperimentGenerationProgress = 0;
     61
    5862      foreach (var alg in algorithms) {
    5963        foreach (ParameterizedValueConfiguration combination in configuration) {
     
    7478        }
    7579      }
     80
    7681      return experiment;
    7782    }
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj

    r8644 r15171  
    1111    <RootNamespace>HeuristicLab.Encodings.ParameterConfigurationEncoding</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515  </PropertyGroup>
     
    3939  </PropertyGroup>
    4040  <ItemGroup>
    41     <Reference Include="HeuristicLab.Collections-3.3">
     41    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     42      <SpecificVersion>False</SpecificVersion>
    4243      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    4344      <Private>False</Private>
    4445    </Reference>
    45     <Reference Include="HeuristicLab.Common-3.3">
     46    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     47      <SpecificVersion>False</SpecificVersion>
    4648      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    4749      <Private>False</Private>
    4850    </Reference>
    4951    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    50       <Private>False</Private>
    51     </Reference>
    52     <Reference Include="HeuristicLab.Core-3.3">
     52      <SpecificVersion>False</SpecificVersion>
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     54      <Private>False</Private>
     55    </Reference>
     56    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     57      <SpecificVersion>False</SpecificVersion>
    5358      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    5459      <Private>False</Private>
    5560    </Reference>
    56     <Reference Include="HeuristicLab.Data-3.3">
     61    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     62      <SpecificVersion>False</SpecificVersion>
    5763      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    5864      <Private>False</Private>
    5965    </Reference>
    60     <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    61     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    62     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
     66    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     67      <SpecificVersion>False</SpecificVersion>
     68      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     69      <Private>False</Private>
     70    </Reference>
     71    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     72      <SpecificVersion>False</SpecificVersion>
     73      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     74      <Private>False</Private>
     75    </Reference>
     76    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     77      <SpecificVersion>False</SpecificVersion>
    6378      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    6479      <Private>False</Private>
    6580    </Reference>
    66     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    67     <Reference Include="HeuristicLab.Optimization-3.3">
     81    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     82      <SpecificVersion>False</SpecificVersion>
     83      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     84      <Private>False</Private>
     85    </Reference>
     86    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     87      <SpecificVersion>False</SpecificVersion>
    6888      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    6989      <Private>False</Private>
    7090    </Reference>
    71     <Reference Include="HeuristicLab.Parameters-3.3">
     91    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     92      <SpecificVersion>False</SpecificVersion>
    7293      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    7394      <Private>False</Private>
    7495    </Reference>
    75     <Reference Include="HeuristicLab.Persistence-3.3">
     96    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     97      <SpecificVersion>False</SpecificVersion>
    7698      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    7799      <Private>False</Private>
    78100    </Reference>
    79     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     101    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
    80103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    81104      <Private>False</Private>
    82105    </Reference>
    83     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    84     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
     106    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <SpecificVersion>False</SpecificVersion>
    85113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    86114      <Private>False</Private>
    87115    </Reference>
    88116    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    89       <Private>False</Private>
    90     </Reference>
    91     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     117      <SpecificVersion>False</SpecificVersion>
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     119      <Private>False</Private>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122      <SpecificVersion>False</SpecificVersion>
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
    92126    <Reference Include="Microsoft.CSharp" />
    93127    <Reference Include="System" />
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterCombinationsEnumerator.cs

    r8517 r15171  
    160160
    161161    public bool MoveNext() {
    162       bool ok = currentEnumerator.Current.MoveNext();
     162      bool ok = currentEnumerator.Current != null && currentEnumerator.Current.MoveNext();
    163163      if (!ok) {
    164164        ok = currentEnumerator.MoveNext();
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

    r8574 r15171  
    2525using System.Linq;
    2626using System.Text;
    27 using System.Threading;
    2827using HeuristicLab.Common;
    2928using HeuristicLab.Core;
     
    3130using HeuristicLab.Optimization;
    3231using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    33 using HeuristicLab.Problems.Instances;
    3432
    3533namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
     
    340338        string algorithmInfo = this.AlgorithmConfiguration.ParameterInfoString;
    341339        string problemInfo = this.ProblemConfiguration.ParameterInfoString;
    342         var sb = new StringBuilder();
    343         if (!string.IsNullOrEmpty(algorithmInfo)) {
    344           sb.Append("Algorithm (");
    345           sb.Append(algorithmInfo);
    346           sb.Append(")");
    347         }
    348         if (!string.IsNullOrEmpty(problemInfo)) {
    349           if (sb.Length > 0)
    350             sb.Append(", ");
    351           sb.Append("Problem( ");
    352           sb.Append(problemInfo);
    353           sb.Append(")");
    354         }
     340
     341        var sb = new StringBuilder(AlgorithmConfiguration.NumberedName);
     342        if (!string.IsNullOrEmpty(algorithmInfo)) sb.AppendFormat(" ({0})", algorithmInfo);
     343        if (!string.IsNullOrEmpty(problemInfo)) sb.AppendFormat(", {0} ({1})", ProblemConfiguration.NumberedName, problemInfo);
     344
    355345        return sb.ToString();
    356346      }
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Plugin.cs.frame

    r8574 r15171  
    4040  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4141  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    42   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4342  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    4443  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
  • branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
Note: See TracChangeset for help on using the changeset viewer.