Changeset 1840

Timestamp:

05/15/09 19:11:47 (15 years ago)

Author:

swagner

Message:

Removed automatic creation of model in ChartDataRowsModelDataCollector (#408)

File:

• trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModelDataCollector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModelDataCollector.cs

@@ -39 +39 @@
     /// <summary>
     /// Initializes a new instance of <see cref="ChartDataRowsModelDataCollector"/> with two variable infos 
-    /// (<c>VariableNames</c> and <c>Values</c>).
+    /// (<c>VariableNames</c> and <c>Model</c>).
     /// </summary>
     public ChartDataRowsModelDataCollector() {
@@ -47 +47 @@
       ItemList<StringData> variableNames = new ItemList<StringData>();
       AddVariable(new Variable("VariableNames", variableNames));
-      AddVariableInfo(new VariableInfo("Model", "Data model in which the collected values should be fed.", typeof(IChartDataRowsModel), VariableKind.New | VariableKind.In | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("Model", "Data model in which the collected values should be fed.", typeof(IChartDataRowsModel), VariableKind.In | VariableKind.Out));
     }
 
@@ -59 +59 @@
       IChartDataRowsModel model = GetVariableValue<IChartDataRowsModel>("Model", scope, true, false);
 
-      // if necessary, add a new model
-      if (model == null) {
-        model = new ChartDataRowsModel();
-        for (int i = 0; i < names.Count; i++)
-          model.AddDataRow(new DataRow(names[i].Data));  // create new data row for each variable name to collect
-
-        IVariableInfo info = GetVariableInfo("Model");
-        if (info.Local)
-          AddVariable(new Variable(info.ActualName, model));
-        else
-          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), model));
-      }
-
       // collect data values and feed them into the model
       for (int i = 0; i < names.Count; i++) {