Changeset 7242

Timestamp:

12/28/11 17:14:43 (12 years ago)

Author:

ascheibe

Message:

#1215 adapted to static item image change and fixed a compiler warning

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.MetaOptimization.Test/HeuristicLab.MetaOptimization.Test.csproj (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationAllPositionsManipulator.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/TypeValue.cs (modified) (3 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/HeuristicLab.MetaOptimization.Test.csproj

@@ -238 +238 @@
     <Reference Include="HeuristicLab.Problems.ExternalEvaluation.GP-3.4">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Problems.ExternalEvaluation.Views-3.3">

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationAllPositionsManipulator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -31 +23 @@
     }
 
-    public static void Apply(IRandom random, IValueConfiguration configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
+    public static new void Apply(IRandom random, IValueConfiguration configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
       configuration.Mutate(random, Mutate, intValueManipulator, doubleValueManipulator);
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/TypeValue.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Drawing;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using System.Drawing;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -13 +9 @@
   [StorableClass]
   public class TypeValue : Item {
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
     }
@@ -36 +32 @@
     }
 
-    public TypeValue() : base() {
+    public TypeValue()
+      : base() {
       this.readOnly = false;
     }
-    public TypeValue(Type value) : base() {
+    public TypeValue(Type value)
+      : base() {
       this.Value = value;
       this.readOnly = false;