Context Navigation

Changeset 9021 for trunk/sources

Timestamp:

12/11/12 12:27:49 (12 years ago)

Author:

mkommend

Message:

#1942: Renamed field of DataAnalysisImportType.

Location:

trunk/sources

Files:

r8885	r9021
32	32	return new ClassificationImportType() {
33	33	Shuffle = ShuffleDataCheckbox.Checked,
34		Training = TrainingTestTrackBar.Value,
	34	TrainingPercentage = TrainingTestTrackBar.Value,
35	35	TargetVariable = (String)TargetVariableComboBox.SelectedValue,
36	36	UniformlyDistributeClasses = UniformDistributionOfClassesCheckbox.Checked

r8885	r9021
57	57	return new DataAnalysisImportType() {
58	58	Shuffle = ShuffleDataCheckbox.Checked,
59		Training = TrainingTestTrackBar.Value
	59	TrainingPercentage = TrainingTestTrackBar.Value
60	60	};
61	61	}

r8885	r9021
30	30	return new RegressionImportType() {
31	31	Shuffle = ShuffleDataCheckbox.Checked,
32		Training = TrainingTestTrackBar.Value,
	32	TrainingPercentage = TrainingTestTrackBar.Value,
33	33	TargetVariable = (String)TargetVariableComboBox.SelectedValue
34	34	};

r8885	r9021
31	31	//time series prognosis problems shall not be shuffled
32	32	Shuffle = false,
33		Training = TrainingTestTrackBar.Value,
	33	TrainingPercentage = TrainingTestTrackBar.Value,
34	34	TargetVariable = (String)TargetVariableComboBox.SelectedValue
35	35	};

-                      r8885
+                      r9021
     protected override IClassificationProblemData ImportData(string path, ClassificationImportType type, TableFileParser csvFileParser) {
       int trainingPartEnd = (csvFileParser.Rows * type.Training) / 100;
+      int trainingPartEnd = (csvFileParser.Rows * type.TrainingPercentage) / 100;
       List<IList> values = csvFileParser.Values;
       if (type.Shuffle) {
 …
         if (type.UniformlyDistributeClasses) {
           values = Shuffle(values, csvFileParser.VariableNames.ToList().FindIndex(x => x.Equals(type.TargetVariable)),
                            type.Training, out trainingPartEnd);
+                           type.TrainingPercentage, out trainingPartEnd);
+        }
+      }

r8877	r9021
100	100	// turn of input variables that are constant in the training partition
101	101	var allowedInputVars = new List<string>();
102		int trainingPartEnd = (csvFileParser.Rows * type.Training) / 100;
	102	int trainingPartEnd = (csvFileParser.Rows * type.TrainingPercentage) / 100;
103	103	var trainingIndizes = Enumerable.Range(0, trainingPartEnd);
104	104	if (trainingIndizes.Count() >= 2) {

r8598	r9021
23	23	public class DataAnalysisImportType {
24	24	public bool Shuffle { get; set; }
25		public int Training { get; set; }
	25	public int TrainingPercentage { get; set; }
26	26	}
27	27	}

r8877	r9021
97	97	// turn of input variables that are constant in the training partition
98	98	var allowedInputVars = new List<string>();
99		int trainingPartEnd = (csvFileParser.Rows * type.Training) / 100;
	99	int trainingPartEnd = (csvFileParser.Rows * type.TrainingPercentage) / 100;
100	100	trainingPartEnd = trainingPartEnd > 0 ? trainingPartEnd : 1;
101	101	var trainingIndizes = Enumerable.Range(0, trainingPartEnd);

r8885	r9021
87	87	// turn of input variables that are constant in the training partition
88	88	var allowedInputVars = new List<string>();
89		int trainingPartEnd = (csvFileParser.Rows * type.Training) / 100;
	89	int trainingPartEnd = (csvFileParser.Rows * type.TrainingPercentage) / 100;
90	90	trainingPartEnd = trainingPartEnd > 0 ? trainingPartEnd : 1;
91	91	var trainingIndizes = Enumerable.Range(0, trainingPartEnd);

Note: See TracChangeset for help on using the changeset viewer.