Add files via upload

Author: forhadsidhu

dataset.cpp

@@ -10,36 +10,54 @@
 void DataSet::ReadCSVFile(std::string file_name) {
 
 	std::ifstream file(file_name.c_str());
-	if (!file) {
+
+	if (!file)
+	{
 		file.open(file_name.c_str());
 	}
 	if (!file) {
-		std::cerr << "Error No" << file_name << " found. " << std::endl;
+		std::cerr << "Error: No " << file_name << " found ." << std::endl;
 
 	}
 
 	std::stringstream buffer;
 	buffer << file.rdbuf();
 	std::string line;
+	
 	std::vector<std::string>lines;
-	while (getline(buffer, line, '\n')) {
-		lines.push_back(line);
+		while (getline(buffer, line,'\n')) {
+			//std::cout << line << std::endl;
+			//std::cout << "ses" << std::endl;
+			lines.push_back(line);
 	}
 
-	//the other lines contain the features for each floaer
 
-	for (int i = 1; i < lines.size(); ++i) {
-		std::vector<float>features =ReadCSVLine(lines[i]);
-		x1_.push_back(features[0]);
-		x2_.push_back(features[1]);
-		x3_.push_back(features[2]);
-		x4_.push_back(features[3]);
-		y_.push_back(features[4]);
+		//std::cout<<"lines-size "<< lines.size() << std::endl;
+		///the other lines contain the features for each flower
+
+		for (int i = 1; i < lines.size(); ++i) {
+
+			//std::cout << lines[i] << std::endl;
+			std::vector<float>features = ReadCSVLine(lines[i]);
+
+			
+
+			mean_.push_back(features[0]);
+			stdev_.push_back(features[1]);
+			kurtosis_.push_back(features[2]);
+			skewness_.push_back(features[3]);
+			snr_.push_back(features[4]);
+			dmsnr_.push_back(features[5]);
+			kurtosissnr_.push_back(features[6]);
+			skewsnr_.push_back(features[7]);
+			class_.push_back(features[8]);
 
 	}
+
 }
 
-std::vector<float>DataSet::ReadCSVLine(std::string line) {
+
+std::vector<float> DataSet::ReadCSVLine(std::string line) {
 	std::vector<float> line_data;
 	std::stringstream lineStream(line);
 	std::string cell;
@@ -48,36 +66,9 @@ std::vector<float>DataSet::ReadCSVLine(std::string line) {
 		if (cell != "setosa" && cell != "versicolor" && cell != "virginica") {
 			line_data.push_back(std::stod(cell.c_str()));
 		}
-		else {
-			if (cell == "setosa") {
-				line_data.push_back(0.0f);
-			}
-			else if (cell == "versicolor") {
-				line_data.push_back(1.0f);
-			}
-			else {
-				line_data.push_back(2.0f);
-			}
-		}
+		
 	}
-	return line_data;
 
+	//std::cout << "Line data size: " << line_data.size() << std::endl;
+	return line_data;
 }
-
-
-std::initializer_list<float> DataSet::input(float petal_length, float petal_width, float sepal_length, float sepal_width) {
-	return { petal_length,petal_width,sepal_length,sepal_width };
-}
-
-std::string DataSet::output(std::vector<float> one_hot_encoding_species) {
-	if (one_hot_encoding_species[0] == 1) {
-		return "setosa";
-	}
-	else if (one_hot_encoding_species[1] == 1) {
-		return "versicolor";
-	}
-	else {
-		return "virginica";
-	}
-}
-

dataset.h

@@ -1,60 +1,72 @@
 #pragma once
-
 #include<iostream>
 #include<string>
 #include<vector>
 #include<unordered_map>
 #include<initializer_list>
 
 
+
 class DataSetMetaData {
 
 	friend class DataSet;
-private:
-	float sepal_length;
-	float sepal_width;
-	float petal_length;
-	float petal_width;
-	std::string species;
+
+
 };
 
+
+
 class DataSet {
 
+	
+
 public:
 
-	//read the given csv file and complete_x and y_
+	//read the given csv file and complete x_ and y_
+
 	void ReadCSVFile(std::string file_name);
+	
 
+	//Construct a dataset from the given csv file path
 
-	//Construct a data set from the given csv file path
 	DataSet(std::string file_name) {
 		ReadCSVFile(file_name);
+
+		//std::cout << "YES COME" << std::endl;
 	}
 
-	///getters
+	//getters
 
-	std::vector<float>& x1() { return x1_; }
-	std::vector<float>& x2() { return x2_; }
-	std::vector<float>& x3() { return x3_; }
-	std::vector<float>& x4() { return x4_;}
-	std::vector<float& y() { return y_; }
+	std::vector<float>mean() { return mean_; };
+	std::vector<float>stdev() { return stdev_; };
+	std::vector<float>kurtosis() { return kurtosis_; };
+	std::vector<float>skewness() { return skewness_; };
+	std::vector<float>snr() { return snr_; };
+	std::vector<float>dmsnr() { return dmsnr_; };
+	std::vector<float>kurtosissnr() { return kurtosissnr_; };
+	std::vector<float>skewsnr() { return skewsnr_; };
+	std::vector<float>clas() { return class_; };
 
+	
 
 
-	///convert one csv line to a vector of float
+	//convert one csv line to a vector of float
 
-	std::vector<float>ReadCSVLine(std::string line);
-	///normalize a human input using the data set metadata
-	std::initializer_list<float>input(float petal_length,float peta_width,float sepal_length,float sepal_width);
+	std::vector<float> ReadCSVLine(std::string line);
 
-	std::string output(std::vector<float>one_hot_encoding_species);
+	
 
 private:
 	DataSetMetaData data_set_metadata;
-	std::vector<float>x1_;
-	std::vector<float>x2_;
-	std::vector < float>x3_;
-	std::vector<float>x4_;
-	std::vector<float>y_;
-};
-
+	std::vector<float>mean_;
+	std::vector<float>stdev_;
+	std::vector<float>kurtosis_;
+	std::vector<float>skewness_;
+	std::vector<float>snr_;
+	std::vector<float>dmsnr_;
+	std::vector<float>kurtosissnr_;
+	std::vector<float>skewsnr_;
+
+	std::vector<float>class_;
+
+};