Changeset 3628

Timestamp:

05/05/10 12:44:29 (14 years ago)

Author:

gkronber

Message:

Added ReadOnlyCheckedItemCollection and ReadOnlyCheckedItemList #992 (CheckedItemList and CheckedItemCollection is necessary)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/CheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs (added)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs (added)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs

@@ -33 +33 @@
 namespace HeuristicLab.Core.Views {
   [View("CheckedItemCollection View")]
-  [Content(typeof(ICheckedItemCollection<>), false)]
+  [Content(typeof(ICheckedItemCollection<>), true)]
   [Content(typeof(CheckedItemCollection<>), true)]
   public partial class CheckedItemCollectionView<T> : ItemCollectionView<T> where T : class, IItem {

trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -37 +37 @@
   [View("CheckedItemList View")]
   [Content(typeof(CheckedItemList<>), true)]
-  [Content(typeof(ICheckedItemList<>), false)]
+  [Content(typeof(ICheckedItemList<>), true)]
   public partial class CheckedItemListView<T> : ItemListView<T> where T : class, IItem {
     public new ICheckedItemList<T> Content {

trunk/sources/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

@@ -113 +113 @@
 
     /// <summary>
+    /// Creates a ReadOnlyCheckedItemCollection containing the same elements.
+    /// </summary>
+    /// <returns>A new ReadOnlyCheckedItemCollection containing the same elements.</returns>
+    public new ReadOnlyCheckedItemCollection<T> AsReadOnly() {
+      return new ReadOnlyCheckedItemCollection<T>(this);
+    }
+
+    /// <summary>
     /// Raised when the collection of items is reset.
     /// </summary>

trunk/sources/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

@@ -149 +149 @@
 
     /// <summary>
+    /// Creates a ReadOnlyCheckedItemList containing the same elements.
+    /// </summary>
+    /// <returns>A new ReadOnlyCheckedItemList containing the same elements.</returns>
+    public new ReadOnlyCheckedItemList<T> AsReadOnly() {
+      return new ReadOnlyCheckedItemList<T>(this);
+    }
+
+    /// <summary>
     /// Raised after the list has been reset.
     /// </summary>

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -104 +104 @@
     <Compile Include="Collections\CheckedItemCollection.cs" />
     <Compile Include="Collections\CheckedItemList.cs" />
+    <Compile Include="Collections\ReadOnlyCheckedItemCollection.cs" />
+    <Compile Include="Collections\ReadOnlyCheckedItemList.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Collections\ReadOnlyItemDictionary.cs" />
     <Compile Include="Collections\ItemDictionary.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs

@@ -46 +46 @@
     }
 
-    public IValueParameter<CheckedItemList<StringValue>> InputVariablesParameter {
-      get { return (IValueParameter<CheckedItemList<StringValue>>)Parameters["InputVariables"]; }
+    public IValueParameter<ICheckedItemList<StringValue>> InputVariablesParameter {
+      get { return (IValueParameter<ICheckedItemList<StringValue>>)Parameters["InputVariables"]; }
     }
 
@@ -85 +85 @@
       }
     }
-    public CheckedItemList<StringValue> InputVariables {
-      get { return (CheckedItemList<StringValue>)InputVariablesParameter.Value; }
+    public ICheckedItemList<StringValue> InputVariables {
+      get { return (ICheckedItemList<StringValue>)InputVariablesParameter.Value; }
       set {
         if (value != InputVariables) {
@@ -140 +140 @@
       : base() {
       Parameters.Add(new ValueParameter<Dataset>("Dataset", new Dataset()));
-      Parameters.Add(new ValueParameter<CheckedItemList<StringValue>>("InputVariables", new CheckedItemList<StringValue>()));
+      Parameters.Add(new ValueParameter<ICheckedItemList<StringValue>>("InputVariables", new CheckedItemList<StringValue>()));
       Parameters.Add(new ConstrainedValueParameter<StringValue>("TargetVariable"));
       Parameters.Add(new ValueParameter<IntValue>("TrainingSamplesStart", new IntValue()));
@@ -329 +329 @@
         ((ConstrainedValueParameter<StringValue>)TargetVariableParameter).ValidValues.Add(variableName);
       TargetVariable = variableNames.First();
-      InputVariables = new CheckedItemList<StringValue>(variableNames);
+      InputVariables = new CheckedItemList<StringValue>(variableNames).AsReadOnly();
       foreach (var variableName in variableNames.Skip(1))
         InputVariables.SetItemCheckedState(variableName, true);