- Timestamp:
- 02/11/09 13:39:30 (15 years ago)
- Location:
- branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/Dataset.cs
r534 r1215 52 52 public int Columns { 53 53 get { return columns; } 54 set { columns = value; } 54 set { 55 columns = value; 56 if (variableNames == null || variableNames.Length != columns) { 57 variableNames = new string[columns]; 58 } 59 } 55 60 } 56 61 … … 90 95 91 96 private string[] variableNames; 92 public string[] VariableNames {93 get { return variableNames; }94 set { variableNames = value; }95 }96 97 97 98 public Dataset() { 98 99 Name = "-"; 99 VariableNames = new string[] { "Var0" };100 variableNames = new string[] { "Var0" }; 100 101 Columns = 1; 101 102 Rows = 1; … … 114 115 } 115 116 } 117 118 public string GetVariableName(int variableIndex) { 119 return variableNames[variableIndex]; 120 } 121 122 public void SetVariableName(int variableIndex, string name) { 123 variableNames[variableIndex] = name; 124 } 125 116 126 117 127 public override IView CreateView() { … … 128 138 clone.Samples = cloneSamples; 129 139 clone.Name = Name; 130 clone. VariableNames = new string[VariableNames.Length];131 Array.Copy( VariableNames, clone.VariableNames, VariableNames.Length);140 clone.variableNames = new string[variableNames.Length]; 141 Array.Copy(variableNames, clone.variableNames, variableNames.Length); 132 142 Array.Copy(scalingFactor, clone.scalingFactor, columns); 133 143 Array.Copy(scalingOffset, clone.scalingOffset, columns); … … 165 175 columns = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat); 166 176 167 VariableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);177 variableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value); 168 178 if(node.Attributes["ScalingFactors"] != null) 169 179 scalingFactor = ParseDoubleString(node.Attributes["ScalingFactors"].Value); -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/DatasetView.cs
r473 r1215 135 135 136 136 private string GetColumnName(int index) { 137 if(Dataset. VariableNames.Length== dataGridView.Columns.Count) {138 return Dataset. VariableNames[index];137 if(Dataset.Columns == dataGridView.Columns.Count) { 138 return Dataset.GetVariableName(index); 139 139 } else { 140 140 return "Var " + index;
Note: See TracChangeset
for help on using the changeset viewer.