fix squashing (#15)

* fix squashing

* Delete .directory

Author: firefly-cpp

.gitignore

@@ -30,3 +30,5 @@
 *.exe
 *.out
 *.app
+
+bin/uARMSolver

sources/Setup.cpp

@@ -268,7 +268,7 @@ void Setup::parse_sq_cauchy(vector<string>tokens)
 	if (tokens[0].compare("CAUCHY_PARAM") == 0) {
 		cout << "CAUCHY_PARAM started..." << endl;
 	} else if (tokens[0].compare("THRESHOLD") == 0) {
-		sq_param.sq.Thresh = stof(tokens[2]);
+		squ_param.sq.Thresh = stof(tokens[2]);
 	}
 }
 
@@ -283,7 +283,7 @@ void Setup::parse_sq_euclid(vector<string>tokens)
 	if (tokens[0].compare("EUCLID_PARAM") == 0) {
 		cout << "EUCLID_PARAM started..." << endl;
 	} else if (tokens[0].compare("THRESHOLD") == 0) {
-		sq_param.sq.Thresh = stof(tokens[2]);
+		squ_param.sq.Thresh = stof(tokens[2]);
 	}
 }
 
@@ -408,7 +408,7 @@ void Setup::print_sq_blk()
 	switch(squash) {
 	case SQUASH_CAUCHY:
 		cout << "Method= CAUCHY" << endl;
-		cout << "Threshold= " << sq_param.sq.Thresh << endl;
+		cout << "Threshold= " << squ_param.sq.Thresh << endl;
 		break;
 	case SQUASH_EUCLID:
 		cout << "Method= EUCLID" << endl;

sources/Setup.h

@@ -39,7 +39,7 @@ using namespace std;
 	};
 
 	// squashing setups
-	struct sq_param {
+	struct squashing_param {
 		double 	Thresh;
 	};
 
@@ -130,8 +130,8 @@ class Setup {
 	} vis_param;			///< visualization parameters
 
 	union {
-		sq_param sq;
-	} sq_param;				///< squashing parameters
+		squashing_param sq;
+	} squ_param;				///< squashing parameters
 
 };
 

sources/Squash.cpp

@@ -47,7 +47,7 @@ int Squash::make_sq_dbase(Setup setup, Problem prob)
 						sim = sq_similarity(prob.dbase[pos], prob.dbase[i]);
 					else
 						sim = sq_distance(prob.dbase[pos], prob.dbase[i], prob.feat);
-					if(sim >= setup.sq_param.sq.Thresh) {
+					if(sim >= setup.squ_param.sq.Thresh) {
 						sq_set.push_back(prob.dbase[i]);
 						set_squashed(i);
 						k++;