X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcom%2Fdogcows%2Fresources%2FC%2B%2BDriver;h=ca48428213dcb43325c87cd68c8d44fc8eef9b74;hb=c76b63d1b374ea6774d648c0a50021357fdd9b80;hp=89e00f0678349fa54f17d27c59bd8fef604cebf6;hpb=9117819d0764d40f6c352e509169b5e4053b5882;p=chaz%2Fvimcoder

diff --git a/src/com/dogcows/resources/C++Driver b/src/com/dogcows/resources/C++Driver
index 89e00f0..ca48428 100644
--- a/src/com/dogcows/resources/C++Driver
+++ b/src/com/dogcows/resources/C++Driver
@@ -11,8 +11,6 @@
 #include <sys/time.h>
 #include <vector>
 
-using namespace std;
-
 
 const static double __EPSILON = 1e-9;
 static double __time = 0.0;
@@ -22,7 +20,7 @@ static void __timer_start()
 	struct timeval tv;
 	if (gettimeofday(&tv, NULL) == 0)
 	{
-		__time = (double)tv.tv_sec + (double)tv.tv_usec * 0.000001;
+		__time = double(tv.tv_sec) * 1000.0 + double(tv.tv_usec) * 0.001;
 	}
 }
 
@@ -34,6 +32,12 @@ static double __timer_stop()
 }
 
 
+static void __eat_whitespace(std::istream& in)
+{
+	while (in.good() && std::isspace(in.peek())) in.get();
+}
+
+
 std::ostream& operator << (std::ostream& out, const std::string& str)
 {
 	out << '"' << str.c_str() << '"';
@@ -55,7 +59,7 @@ std::ostream& operator << (std::ostream& out, const std::vector<T>& vec)
 
 std::istream& operator >> (std::istream& in, std::string& str)
 {
-	while (in.good() && std::isspace(in.peek())) in.get();
+	__eat_whitespace(in);
 
 	int c;
 	if (in.good() && (c = in.get()) == '"')
@@ -74,26 +78,29 @@ std::istream& operator >> (std::istream& in, std::string& str)
 template <class T>
 std::istream& operator >> (std::istream& in, std::vector<T>& vec)
 {
-	while (in.good() && std::isspace(in.peek())) in.get();
+	__eat_whitespace(in);
 
 	int c;
 	if (in.good() && (c = in.get()) == '{')
 	{
-		while (in.good() && std::isspace(in.peek())) in.get();
-		T t;
+		__eat_whitespace(in);
 		vec.clear();
 		while (in.good() && (c = in.get()) != '}')
 		{
 			if (c != ',') in.putback(c);
+
+			T t;
 			in >> t;
+			__eat_whitespace(in);
+
 			vec.push_back(t);
-			while (in.good() && std::isspace(in.peek())) in.get();
 		}
 	}
 
 	return in;
 }
 
+
 template <class T>
 bool __equals(const T& actual, const T& expected)
 {
@@ -117,11 +124,17 @@ bool __equals(double actual, double expected)
 bool __equals(const std::vector<double>& actual, const std::vector<double>& expected)
 {
 	if (actual.size() != expected.size())
+	{
 		return false;
+	}
 
 	for (size_t i = 0; i < actual.size(); ++i)
+	{
 		if (!__equals(actual[i], expected[i]))
+		{
 			return false;
+		}
+	}
 
 	return true;
 }
@@ -129,58 +142,66 @@ bool __equals(const std::vector<double>& actual, const std::vector<double>& expe
 
 int main(int argc, char* argv[])
 {
-	bool	__exit_on_fail = false;
+	bool	__abort_on_fail = false;
 	int	__pass = 0;
 	int	__fail = 0;
 
-	if (1 < argc) __exit_on_fail = true;
+	if (1 < argc) __abort_on_fail = true;
+
+	std::cout << "TAP version 13" << std::endl;
+	std::cout.flush();
 
 	std::ifstream __in("testcases.txt");
 	for(;;)
 	{
+		int __testnum = __pass + __fail + 1;
+
 		$RETURNTYPE$	__expected;
 		$METHODPARAMDECLARES$
 		__in >> __expected >> $METHODPARAMSTREAMIN$;
 		if (!__in.good()) break;
 
-		std::cout << "----------------------------------------" << std::endl
-			  << "Test " << (__pass + __fail) << ": ";
+		std::cout << "# input for test " << __testnum << ": " << $METHODPARAMSTREAMOUT$ << std::endl;
 		std::cout.flush();
 
 		__timer_start();
 
-		$CLASSNAME$ object;
-		$RETURNTYPE$ __actual = object.$METHODNAME$($METHODPARAMNAMES$);
+		$CLASSNAME$ __object;
+		$RETURNTYPE$ __actual = __object.$METHODNAME$($METHODPARAMNAMES$);
 
 		double __t = __timer_stop();
 
+		std::cout << "# test completed in " << __t << "ms" << std::endl;
+		std::cout.flush();
+
 		if (__equals(__actual, __expected))
 		{
-			std::cout << "[PASS] in " << __t << " seconds." << std::endl;
+			std::cout << "ok";
 			++__pass;
 		}
 		else
 		{
-			std::cout << "[FAIL] in " << __t << " seconds." << std::endl
-				  << "->  Input: " << $METHODPARAMSTREAMOUT$ << std::endl
-				  << "   Actual: " << __actual << std::endl
-				  << " Expected: " << __expected << std::endl;
+			std::cout << "not ok";
 			++__fail;
-			if (__exit_on_fail) exit(1);
 		}
+
+		std::cout << " " << __testnum << " - " << __actual << " must equal " << __expected << std::endl;
+		std::cout.flush();
+
+		if (__abort_on_fail && 0 < __fail) std::abort();
 	}
 
-	std::cout << "========================================" << std::endl
-		  << " Total Pass: " << __pass << std::endl
-		  << " Total Fail: " << __fail << std::endl;
+	std::cout << "1.." << (__pass + __fail) << std::endl
+		  << "# passed: " << __pass << std::endl
+		  << "# failed: " << __fail << std::endl;
 
 	if (__fail == 0)
 	{
-		std::cout << std::endl << "Nice!  "
-			  << "Don't forget to compile remotely before submitting."
-			  << std::endl;
+		std::cout << std::endl
+			  << "# Nice! Don't forget to compile remotely before submitting." << std::endl;
 	}
 
 	return __fail;
 }
 
+// vim:ft=cpp:noet:ts=8