Changeset 13656 for branches/WebJobManager/HeuristicLab.Optimization/3.3/Problems

Timestamp:

03/07/16 10:18:05 (9 years ago)

Author:

ascheibe

Message:

#2582 created branch for Hive Web Job Manager

Location:

branches/WebJobManager

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -35 +35 @@
   public abstract class Problem : ParameterizedNamedItem, IProblem {
     private const string OperatorsParameterName = "Operators";
-    public IFixedValueParameter<ItemCollection<IItem>> OperatorsParameter {
+    public IFixedValueParameter<ItemCollection<IItem>> OperatorsParameter
+    {
       get { return (IFixedValueParameter<ItemCollection<IItem>>)Parameters[OperatorsParameterName]; }
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
+    public static new Image StaticItemImage
+    {
+      get { return new Bitmap(25, 25); }
     }
 
@@ -85 +87 @@
     #region Backwards compatible code, remove with 3.4
     [Storable(Name = "Operators", AllowOneWay = true)]
-    private IEnumerable<IOperator> StorableOperators {
-      set {
+    private IEnumerable<IOperator> StorableOperators
+    {
+      set
+      {
         IParameter operatorsParam;
         if (Parameters.TryGetValue(OperatorsParameterName, out operatorsParam)) {
@@ -102 +106 @@
     }
     #endregion
-    protected ItemCollection<IItem> Operators {
-      get {
+    protected ItemCollection<IItem> Operators
+    {
+      get
+      {
         // BackwardsCompatibility3.3
         #region Backwards compatible code, remove with 3.4
@@ -120 +126 @@
     }
 
-    public virtual IEnumerable<IParameterizedItem> ExecutionContextItems {
+    public virtual IEnumerable<IParameterizedItem> ExecutionContextItems
+    {
       get { yield return this; }
     }

branches/WebJobManager/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -43 +43 @@
     public string Filename { get; set; }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
-    }
-    public new ParameterCollection Parameters {
+    public static new Image StaticItemImage
+    {
+      get { return new Bitmap(25, 25); }
+    }
+    public new ParameterCollection Parameters
+    {
       get { return base.Parameters; }
     }
-    IKeyedItemCollection<string, IParameter> IParameterizedItem.Parameters {
+    IKeyedItemCollection<string, IParameter> IParameterizedItem.Parameters
+    {
       get { return Parameters; }
     }
 
     #region Parameters
-    public IValueParameter<ISingleObjectiveEvaluator> EvaluatorParameter {
+    public IValueParameter<ISingleObjectiveEvaluator> EvaluatorParameter
+    {
       get { return (IValueParameter<ISingleObjectiveEvaluator>)Parameters["Evaluator"]; }
     }
-    public ValueParameter<BoolValue> MaximizationParameter {
+    public ValueParameter<BoolValue> MaximizationParameter
+    {
       get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter
+    {
       get { return MaximizationParameter; }
     }
-    public ValueParameter<ISolutionCreator> SolutionCreatorParameter {
+    public ValueParameter<ISolutionCreator> SolutionCreatorParameter
+    {
       get { return (ValueParameter<ISolutionCreator>)Parameters["SolutionCreator"]; }
     }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
+    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter
+    {
       get { return SolutionCreatorParameter; }
     }
-    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
+    IParameter IHeuristicOptimizationProblem.EvaluatorParameter
+    {
       get { return EvaluatorParameter; }
     }
-    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
+    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter
+    {
       get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
-    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter
+    {
       get { return BestKnownQualityParameter; }
     }
-    public OptionalValueParameter<IScope> BestKnownSolutionParameter {
+    public OptionalValueParameter<IScope> BestKnownSolutionParameter
+    {
       get { return (OptionalValueParameter<IScope>)Parameters["BestKnownSolution"]; }
     }
-    public ValueParameter<ItemList<IItem>> OperatorsParameter {
+    public ValueParameter<ItemList<IItem>> OperatorsParameter
+    {
       get { return (ValueParameter<ItemList<IItem>>)Parameters["Operators"]; }
     }
@@ -87 +100 @@
 
     #region Properties
-    public BoolValue Maximization {
+    public BoolValue Maximization
+    {
       get { return MaximizationParameter.Value; }
       set { MaximizationParameter.Value = value; }
     }
-    public ISolutionCreator SolutionCreator {
+    public ISolutionCreator SolutionCreator
+    {
       get { return SolutionCreatorParameter.Value; }
       set { SolutionCreatorParameter.Value = value; }
     }
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
+    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator
+    {
       get { return SolutionCreatorParameter.Value; }
     }
-    public ISingleObjectiveEvaluator Evaluator {
+    public ISingleObjectiveEvaluator Evaluator
+    {
       get { return EvaluatorParameter.Value; }
       set { EvaluatorParameter.Value = value; }
     }
-    ISingleObjectiveEvaluator ISingleObjectiveHeuristicOptimizationProblem.Evaluator {
+    ISingleObjectiveEvaluator ISingleObjectiveHeuristicOptimizationProblem.Evaluator
+    {
       get { return EvaluatorParameter.Value; }
     }
-    IEvaluator IHeuristicOptimizationProblem.Evaluator {
+    IEvaluator IHeuristicOptimizationProblem.Evaluator
+    {
       get { return EvaluatorParameter.Value; }
     }
-    public DoubleValue BestKnownQuality {
+    public DoubleValue BestKnownQuality
+    {
       get { return BestKnownQualityParameter.Value; }
       set { BestKnownQualityParameter.Value = value; }
     }
-    public IEnumerable<IItem> Operators {
+    public IEnumerable<IItem> Operators
+    {
       get { return OperatorsParameter.Value; }
     }
 
-    public IEnumerable<IParameterizedItem> ExecutionContextItems {
+    public IEnumerable<IParameterizedItem> ExecutionContextItems
+    {
       get { yield return this; }
     }
@@ -250 +272 @@
       #region ISingleObjectiveEvaluator Members
 
-      public ILookupParameter<DoubleValue> QualityParameter {
+      public ILookupParameter<DoubleValue> QualityParameter
+      {
         get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
       }
@@ -276 +299 @@
       #endregion
 
-      public static new Image StaticItemImage {
-        get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
+      public static new Image StaticItemImage
+      {
+        get { return new Bitmap(25, 25); }
       }
     }