Test typescript version, not passing

LokiResearch · May 9, 2024 · c02bacf · c02bacf
1 parent f192a3f
commit c02bacf
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,9 @@
-all: testcplusplus 
+all: testcplusplus testTypescript
 
 # C++ version original
 testcplusplus:
 	cd cpp ; make Makefilecpp
 
-
+# Typescript
+testTypescript:
+	cd typescript ; make
diff --git a/cpp/main.cpp b/cpp/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char* argv[]){
 	     string s = value.substr(0,value.length()-1);
 	     InputEvent e = predict(ts, x, y, s);
 	     fileO << ts << "," << x << "," << y << "," << s << "," << e.x << "," << e.y << endl;
-	     cout << "{x:" << x << ", y:" << y << ", s: \"" << s << "\", xp:" << e.x << ", yp:" << e.y << "}, "; 
+	     //cout << "{x:" << x << ", y:" << y << ", s: \"" << s << "\", xp:" << e.x << ", yp:" << e.y << "}, "; 
 	}
 	cout << endl;
 	fileO.close();

diff --git a/test.py b/test.py
@@ -16,7 +16,10 @@
     print("%s does not exist"%args.filename, file=sys.stderr)
     sys.exit()
 
-df = pandas.read_csv('strokesPredicted64GroundTruth.csv')
+try:
+    df = pandas.read_csv('strokesPredicted64GroundTruth.csv')
+except:
+    df = pandas.read_csv('../strokesPredicted64GroundTruth.csv')
 df2 = pandas.read_csv(args.filename)
 
 problem = False

diff --git a/typescript/Makefile b/typescript/Makefile
@@ -0,0 +1,7 @@
+PYTHON=python3
+
+all:
+	npm install ; \
+	tsc ; \
+	node dist/test.js > test.csv ; \
+	$(PYTHON) ../test.py typescript test.csv
diff --git a/typescript/package.json b/typescript/package.json
@@ -18,7 +18,7 @@
     "latency"
   ],
   "devDependencies": {
-    "@types/node": "^20.8.3"
+    "@types/node": "^20.12.11"
   },
   "dependencies": {
     "1eurofilter": "^1.2.1"

diff --git a/typescript/src/test.ts b/typescript/src/test.ts