Changeset 3166 for trunk

Timestamp:

03/22/10 10:36:01 (15 years ago)

Author:

svonolfe

Message:

Renamed Knapsack to KnapsackProblem and KnapsackView to KnapsackProblemView (#917)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Knapsack.Views/3.3/HeuristicLab.Problems.Knapsack.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackProblemView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackView.Designer.cs) (1 diff)
• HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackProblemView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackView.cs) (3 diffs)
• HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Knapsack.cs) (3 diffs)

trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/HeuristicLab.Problems.Knapsack.Views-3.3.csproj

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="HeuristicLabProblemsKnapsackViewsPlugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="KnapsackView.cs">
+    <Compile Include="KnapsackProblemView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="KnapsackView.Designer.cs">
-      <DependentUpon>KnapsackView.cs</DependentUpon>
+    <Compile Include="KnapsackProblemView.Designer.cs">
+      <DependentUpon>KnapsackProblemView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackProblemView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.Knapsack.Views {
-  partial class KnapsackView {
+  partial class KnapsackProblemView {
     /// <summary>
     /// Required designer variable.

trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackProblemView.cs

@@ -9 +9 @@
 
 namespace HeuristicLab.Problems.Knapsack.Views {
-  [View("Knapsack View")]
-  [Content(typeof(Knapsack), true)]
-  public partial class KnapsackView : HeuristicLab.Optimization.Views.ProblemView {
-    public new Knapsack Content {
-      get { return (Knapsack)base.Content; }
+  [View("KnapsackProblem View")]
+  [Content(typeof(KnapsackProblem), true)]
+  public partial class KnapsackProblemView : HeuristicLab.Optimization.Views.ProblemView {
+    public new KnapsackProblem Content {
+      get { return (KnapsackProblem)base.Content; }
       set { base.Content = value; }
     }
@@ -20 +20 @@
     /// Initializes a new instance of <see cref="ItemBaseView"/>.
     /// </summary>
-    public KnapsackView() {
+    public KnapsackProblemView() {
       InitializeComponent();
     }
@@ -27 +27 @@
     /// </summary>
     /// <param name="item">The item that should be displayed.</param>
-    public KnapsackView(Knapsack content)
+    public KnapsackProblemView(KnapsackProblem content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

@@ -86 +86 @@
     <Compile Include="Interfaces\IKnapsackSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
-    <Compile Include="Knapsack.cs" />
+    <Compile Include="KnapsackProblem.cs" />
     <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -34 +34 @@
 
 namespace HeuristicLab.Problems.Knapsack {
-  [Item("Knapsack", "Represents a Knapsack Problem.")]
+  [Item("KnapsackProblem", "Represents a Knapsack Problem.")]
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class Knapsack : ParameterizedNamedItem, ISingleObjectiveProblem {
+  public sealed class KnapsackProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
@@ -157 +157 @@
     }
 
-    public Knapsack()
+    public KnapsackProblem()
       : base() {
       RandomBinaryVectorCreator creator = new RandomBinaryVectorCreator();
@@ -184 +184 @@
 
     [StorableConstructor]
-    private Knapsack(bool deserializing) : base() { }
+    private KnapsackProblem(bool deserializing) : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Knapsack clone = (Knapsack)base.Clone(cloner);
+      KnapsackProblem clone = (KnapsackProblem)base.Clone(cloner);
       clone.Initialize();
       return clone;