test with g++

mcximing · mcximing · commit 03dca79c9d6b · 2016-05-06T22:31:02.000+08:00
diff --git a/Hungarian.cpp b/Hungarian.cpp
@@ -9,6 +9,9 @@
 // by Cong Ma, 2016
 // 
 
+#include <stdlib.h>
+#include <cfloat> // for DBL_MAX
+#include <cmath>  // for fabs()
 #include "Hungarian.h"
 
 
@@ -19,7 +22,7 @@ HungarianAlgorithm::~HungarianAlgorithm(){}
 //********************************************************//
 // A single function wrapper for solving assignment problem.
 //********************************************************//
-double HungarianAlgorithm::Solve(vector<vector<double>>& DistMatrix, vector<int>& Assignment)
+double HungarianAlgorithm::Solve(vector <vector<double> >& DistMatrix, vector<int>& Assignment)
 {
 	unsigned int nRows = DistMatrix.size();
 	unsigned int nCols = DistMatrix[0].size();
diff --git a/Hungarian.h b/Hungarian.h
@@ -9,6 +9,9 @@
 // by Cong Ma, 2016
 // 
 
+#ifndef HUNGARIAN_H
+#define HUNGARIAN_H
+
 #include <iostream>
 #include <vector>
 
@@ -20,7 +23,7 @@ class HungarianAlgorithm
 public:
 	HungarianAlgorithm();
 	~HungarianAlgorithm();
-	double Solve(vector<vector<double>>& DistMatrix, vector<int>& Assignment);
+	double Solve(vector <vector<double> >& DistMatrix, vector<int>& Assignment);
 
 private:
 	void assignmentoptimal(int *assignment, double *cost, double *distMatrix, int nOfRows, int nOfColumns);
@@ -32,3 +35,6 @@ class HungarianAlgorithm
 	void step4(int *assignment, double *distMatrix, bool *starMatrix, bool *newStarMatrix, bool *primeMatrix, bool *coveredColumns, bool *coveredRows, int nOfRows, int nOfColumns, int minDim, int row, int col);
 	void step5(int *assignment, double *distMatrix, bool *starMatrix, bool *newStarMatrix, bool *primeMatrix, bool *coveredColumns, bool *coveredRows, int nOfRows, int nOfColumns, int minDim);
 };
+
+
+#endif
diff --git a/testMain.cpp b/testMain.cpp
@@ -4,7 +4,8 @@
 
 int main(void)
 {
-	vector<vector<double>> costMatrix = { { 10, 19, 8, 15, 0 }, 
+    // please use "-std=c++11" for this initialization of vector.
+	vector< vector<double> > costMatrix = { { 10, 19, 8, 15, 0 }, 
 										  { 10, 18, 7, 17, 0 }, 
 										  { 13, 16, 9, 14, 0 }, 
 										  { 12, 19, 8, 18, 0 } };

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`
`5`	`5`	`int main(void)`
`6`	`6`	`{`
`7`		`- vector<vector<double>> costMatrix = { { 10, 19, 8, 15, 0 },`
	`7`	`+ // please use "-std=c++11" for this initialization of vector.`
	`8`	`+ vector< vector<double> > costMatrix = { { 10, 19, 8, 15, 0 },`
`8`	`9`	`{ 10, 18, 7, 17, 0 },`
`9`	`10`	`{ 13, 16, 9, 14, 0 },`
`10`	`11`	`{ 12, 19, 8, 18, 0 } };`