Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11814


Ignore:
Timestamp:
01/21/15 13:10:24 (8 years ago)
Author:
mkommend
Message:

#2174: Renamed scriptable to programmable problem.

Location:
branches/ProgrammableProblem
Files:
6 edited
6 moved

Legend:

Unmodified
Added
Removed
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj

    r11813 r11814  
    110110      <DependentUpon>ProblemDefinitionScriptView.cs</DependentUpon>
    111111    </Compile>
    112     <Compile Include="MultiObjectiveScriptableProblemView.cs">
     112    <Compile Include="MultiObjectiveProgrammableProblemView.cs">
    113113      <SubType>UserControl</SubType>
    114114    </Compile>
    115     <Compile Include="MultiObjectiveScriptableProblemView.Designer.cs">
    116       <DependentUpon>MultiObjectiveScriptableProblemView.cs</DependentUpon>
     115    <Compile Include="MultiObjectiveProgrammableProblemView.Designer.cs">
     116      <DependentUpon>MultiObjectiveProgrammableProblemView.cs</DependentUpon>
    117117    </Compile>
    118     <Compile Include="SingleObjectiveScriptableProblemView.cs">
     118    <Compile Include="SingleObjectiveProgrammableProblemView.cs">
    119119      <SubType>UserControl</SubType>
    120120    </Compile>
    121     <Compile Include="SingleObjectiveScriptableProblemView.Designer.cs">
    122       <DependentUpon>SingleObjectiveScriptableProblemView.cs</DependentUpon>
     121    <Compile Include="SingleObjectiveProgrammableProblemView.Designer.cs">
     122      <DependentUpon>SingleObjectiveProgrammableProblemView.cs</DependentUpon>
    123123    </Compile>
    124124    <Compile Include="Properties\AssemblyInfo.cs" />
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/MultiObjectiveProgrammableProblemView.Designer.cs

    r11812 r11814  
    2121
    2222namespace HeuristicLab.Problems.Programmable.Views {
    23   partial class MultiObjectiveScriptableProblemView {
     23  partial class MultiObjectiveProgrammableProblemView {
    2424    /// <summary>
    2525    /// Required designer variable.
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/MultiObjectiveProgrammableProblemView.cs

    r11812 r11814  
    2828namespace HeuristicLab.Problems.Programmable.Views {
    2929  [View("Multi-Objective Programmable Problem View")]
    30   [Content(typeof(MultiObjectiveScriptableProblem), true)]
    31   public partial class MultiObjectiveScriptableProblemView : ItemView {
     30  [Content(typeof(MultiObjectiveProgrammableProblem), true)]
     31  public partial class MultiObjectiveProgrammableProblemView : ItemView {
    3232    protected ViewHost ScriptView;
    3333
    34     public new MultiObjectiveScriptableProblem Content {
    35       get { return (MultiObjectiveScriptableProblem)base.Content; }
     34    public new MultiObjectiveProgrammableProblem Content {
     35      get { return (MultiObjectiveProgrammableProblem)base.Content; }
    3636      set { base.Content = value; }
    3737    }
    3838
    39     public MultiObjectiveScriptableProblemView() {
     39    public MultiObjectiveProgrammableProblemView() {
    4040      InitializeComponent();
    4141      ScriptView = new ViewHost() { ViewsLabelVisible = false, Dock = DockStyle.Fill };
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/SingleObjectiveProgrammableProblemView.Designer.cs

    r11812 r11814  
    2121
    2222namespace HeuristicLab.Problems.Programmable.Views {
    23   partial class SingleObjectiveScriptableProblemView {
     23  partial class SingleObjectiveProgrammableProblemView {
    2424    /// <summary>
    2525    /// Required designer variable.
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/SingleObjectiveProgrammableProblemView.cs

    r11812 r11814  
    2828namespace HeuristicLab.Problems.Programmable.Views {
    2929  [View("Single-Objective Scriptable Problem View")]
    30   [Content(typeof(SingleObjectiveScriptableProblem), true)]
    31   public partial class SingleObjectiveScriptableProblemView : ItemView {
     30  [Content(typeof(SingleObjectiveProgrammableProblem), true)]
     31  public partial class SingleObjectiveProgrammableProblemView : ItemView {
    3232    protected ViewHost ScriptView;
    3333
    34     public new SingleObjectiveScriptableProblem Content {
    35       get { return (SingleObjectiveScriptableProblem)base.Content; }
     34    public new SingleObjectiveProgrammableProblem Content {
     35      get { return (SingleObjectiveProgrammableProblem)base.Content; }
    3636      set { base.Content = value; }
    3737    }
    3838
    39     public SingleObjectiveScriptableProblemView() {
     39    public SingleObjectiveProgrammableProblemView() {
    4040      InitializeComponent();
    4141      ScriptView = new ViewHost() { ViewsLabelVisible = false, Dock = DockStyle.Fill };
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r11813 r11814  
    150150    <Compile Include="New\BasicProblem.cs" />
    151151    <Compile Include="New\MultiObjectiveBasicProblem.cs" />
    152     <Compile Include="New\MultiObjectiveScriptableProblem.cs" />
     152    <Compile Include="New\MultiObjectiveProgrammableProblem.cs" />
    153153    <Compile Include="New\Scripts\Templates\CompiledMultiObjectiveProblemDefinition.cs" />
    154154    <Compile Include="New\Scripts\Templates\CompiledSingleObjectiveProblemDefinition.cs" />
     
    176176    <Compile Include="New\OneMaxNew.cs" />
    177177    <Compile Include="New\SingleObjectiveBasicProblem.cs" />
    178     <Compile Include="New\SingleObjectiveScriptableProblem.cs" />
     178    <Compile Include="New\SingleObjectiveProgrammableProblem.cs" />
    179179    <Compile Include="New\Scripts\MultiObjectiveProblemDefinitionScript.cs" />
    180180    <Compile Include="New\Scripts\SingleObjectiveProblemDefinitionScript.cs" />
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs

    r11813 r11814  
    3131namespace HeuristicLab.Problems.Programmable {
    3232  [StorableClass]
    33   public abstract class ProgrammableProblem<TEncoding, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator>, IProblemDefinition, IStorableContent
     33  public abstract class BasicProblem<TEncoding, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator>, IProblemDefinition, IStorableContent
    3434    where TEncoding : class, IEncoding
    3535    where TEvaluator : class, IEvaluator {
     
    6464    }
    6565
    66     protected ProgrammableProblem()
     66    protected BasicProblem()
    6767      : base() {
    6868      Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
     
    7171    }
    7272
    73     protected ProgrammableProblem(ProgrammableProblem<TEncoding, TEvaluator> original, Cloner cloner)
     73    protected BasicProblem(BasicProblem<TEncoding, TEvaluator> original, Cloner cloner)
    7474      : base(original, cloner) {
    7575      oldEncoding = cloner.Clone(original.oldEncoding);
     
    7878
    7979    [StorableConstructor]
    80     protected ProgrammableProblem(bool deserializing) : base(deserializing) { }
     80    protected BasicProblem(bool deserializing) : base(deserializing) { }
    8181    [StorableHook(HookType.AfterDeserialization)]
    8282    private void AfterDeserialization() {
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveBasicProblem.cs

    r11813 r11814  
    3030namespace HeuristicLab.Problems.Programmable {
    3131  [StorableClass]
    32   public abstract class MultiObjectiveProgrammableProblem<TEncoding> : ProgrammableProblem<TEncoding, MultiObjectiveEvaluator>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition
     32  public abstract class MultiObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, MultiObjectiveEvaluator>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition
    3333  where TEncoding : class, IEncoding {
    3434    [StorableConstructor]
    35     protected MultiObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
     35    protected MultiObjectiveBasicProblem(bool deserializing) : base(deserializing) { }
    3636
    37     protected MultiObjectiveProgrammableProblem(MultiObjectiveProgrammableProblem<TEncoding> original, Cloner cloner)
     37    protected MultiObjectiveBasicProblem(MultiObjectiveBasicProblem<TEncoding> original, Cloner cloner)
    3838      : base(original, cloner) {
    3939      ParameterizeOperators();
    4040    }
    4141
    42     protected MultiObjectiveProgrammableProblem()
     42    protected MultiObjectiveBasicProblem()
    4343      : base() {
    4444      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", new BoolArray()));
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveProgrammableProblem.cs

    r11812 r11814  
    2828
    2929namespace HeuristicLab.Problems.Programmable {
    30   [Item("Scriptable Problem (multi-objective)", "Represents a multi-objective problem that can be scripted.")]
     30  [Item("Programmable Problem (multi-objective)", "Represents a multi-objective problem that can be programmed with a script.")]
    3131  [Creatable("1 Test")]
    3232  [StorableClass]
    33   public sealed class MultiObjectiveScriptableProblem : MultiObjectiveProgrammableProblem<IEncoding> {
     33  public sealed class MultiObjectiveProgrammableProblem : MultiObjectiveBasicProblem<IEncoding> {
    3434
    3535    private FixedValueParameter<MultiObjectiveProblemDefinitionScript> MultiObjectiveProblemScriptParameter {
     
    4545    }
    4646
    47     private MultiObjectiveScriptableProblem(MultiObjectiveScriptableProblem original, Cloner cloner)
     47    private MultiObjectiveProgrammableProblem(MultiObjectiveProgrammableProblem original, Cloner cloner)
    4848      : base(original, cloner) {
    4949      RegisterEvents();
     
    5555      }
    5656    }
    57     public override IDeepCloneable Clone(Cloner cloner) { return new MultiObjectiveScriptableProblem(this, cloner); }
     57    public override IDeepCloneable Clone(Cloner cloner) { return new MultiObjectiveProgrammableProblem(this, cloner); }
    5858
    5959
    6060    [StorableConstructor]
    61     private MultiObjectiveScriptableProblem(bool deserializing) : base(deserializing) { }
     61    private MultiObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
    6262
    63     public MultiObjectiveScriptableProblem()
     63    public MultiObjectiveProgrammableProblem()
    6464      : base() {
    6565      Parameters.Add(new FixedValueParameter<MultiObjectiveProblemDefinitionScript>("ProblemScript", "Defines the problem.", new MultiObjectiveProblemDefinitionScript() { Name = Name }));
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/OneMaxNew.cs

    r11813 r11814  
    3232  [Creatable("1 Test")]
    3333  [StorableClass]
    34   public class OneMaxNew : SingleObjectiveProgrammableProblem<BinaryEncoding> {
     34  public class OneMaxNew : SingleObjectiveBasicProblem<BinaryEncoding> {
    3535    public override bool Maximization {
    3636      get { return true; }
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveBasicProblem.cs

    r11813 r11814  
    3232namespace HeuristicLab.Problems.Programmable {
    3333  [StorableClass]
    34   public abstract class SingleObjectiveProgrammableProblem<TEncoding> : ProgrammableProblem<TEncoding, SingleObjectiveEvaluator>,
     34  public abstract class SingleObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, SingleObjectiveEvaluator>,
    3535    ISingleObjectiveProblemDefinition, ISingleObjectiveHeuristicOptimizationProblem
    3636  where TEncoding : class, IEncoding {
    3737    [StorableConstructor]
    38     protected SingleObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
     38    protected SingleObjectiveBasicProblem(bool deserializing) : base(deserializing) { }
    3939
    40     protected SingleObjectiveProgrammableProblem(SingleObjectiveProgrammableProblem<TEncoding> original, Cloner cloner)
     40    protected SingleObjectiveBasicProblem(SingleObjectiveBasicProblem<TEncoding> original, Cloner cloner)
    4141      : base(original, cloner) {
    4242      ParameterizeOperators();
    4343    }
    4444
    45     protected SingleObjectiveProgrammableProblem()
     45    protected SingleObjectiveBasicProblem()
    4646      : base() {
    4747      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", new BoolValue()));
  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveProgrammableProblem.cs

    r11812 r11814  
    2929
    3030namespace HeuristicLab.Problems.Programmable {
    31   [Item("Scriptable Problem (single-objective)", "Represents a single-objective problem that can be scripted.")]
     31  [Item("Programmable Problem (single-objective)", "Represents a single-objective problem that can be programmed with a script.")]
    3232  [Creatable("1 Test")]
    3333  [StorableClass]
    34   public sealed class SingleObjectiveScriptableProblem : SingleObjectiveProgrammableProblem<IEncoding> {
     34  public sealed class SingleObjectiveProgrammableProblem : SingleObjectiveBasicProblem<IEncoding> {
    3535
    3636    private FixedValueParameter<SingleObjectiveProblemDefinitionScript> SingleObjectiveProblemScriptParameter {
     
    4646    }
    4747
    48     private SingleObjectiveScriptableProblem(SingleObjectiveScriptableProblem original, Cloner cloner)
     48    private SingleObjectiveProgrammableProblem(SingleObjectiveProgrammableProblem original, Cloner cloner)
    4949      : base(original, cloner) {
    5050      RegisterEvents();
     
    5656      }
    5757    }
    58     public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveScriptableProblem(this, cloner); }
     58    public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveProgrammableProblem(this, cloner); }
    5959
    6060
    6161    [StorableConstructor]
    62     private SingleObjectiveScriptableProblem(bool deserializing) : base(deserializing) { }
     62    private SingleObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
    6363
    64     public SingleObjectiveScriptableProblem()
     64    public SingleObjectiveProgrammableProblem()
    6565      : base() {
    6666      Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript>("ProblemScript", "Defines the problem.", new SingleObjectiveProblemDefinitionScript() { Name = Name }));
Note: See TracChangeset for help on using the changeset viewer.