Commit

Author: Nikitina2005

core/src/core.cpp

@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) {
     		syst += "\"";
     		FILE* r = fopen("AllPaths.txt", "a");
     		fclose(r);
-    		setenv("JAVA_HOME", "/usr/lib/jvm/jdk-15.0.2", true);
+    		setenv("JAVA_HOME", "/usr/lib/jvm/jdk-15", true);
       		system(syst.c_str());
     		string path = pwd;
     		path += "/results/graph_AP_SPPF_INMEM.csv";

front/tests/spaced/test_graph1

@@ -11,4 +11,3 @@ fn_0_basic_block_0_0 fn_0_basic_block_1_0 fn_0_basic_block_2_0 fn_1_basic_block_
 3 4 
 5 6 
 6 4 
-

front/tests/speed_tests/graph_generator

@@ -0,0 +1,30 @@
+1
+5
+S A B 
+S A R 
+R S B 
+A a 
+B b
+
+10 20
+T T T T T T T T T T 
+8 7 b
+6 3 c
+4 2 b
+3 2 b
+6 1 b
+1 9 b
+9 2 a
+4 5 c
+1 4 c
+4 8 b
+7 1 b
+6 4 c
+7 9 b
+5 2 c
+1 3 b
+6 1 c
+9 8 c
+7 4 c
+1 7 b
+2 8 c

front/tests/speed_tests/graph_generator.py

@@ -1,16 +1,16 @@
 import random
 import sys
-fout = open("graph_generator.output", "w")
+fout = open("tests/speed_tests/graph_generator", "w")
 fout.write("1\n5\n")
-fout.write("S AB \nS AR \nR SB \nA a \nB b\n")
+fout.write("S A B \nS A R \nR S B \nA a \nB b\n")
 type = int(sys.argv[1]) #type of graph by density
 n = int(sys.argv[2])    #number of vertices
 if type == 0:
     m = 2*n
 if type == 1:
     m = int(n**1.5)
 if type == 2:
-    m = n**2/4
+    m = int(n**2/4)
 if type == 3:
     m = n*(n-1)
 fout.write("\n")

front/tests/speed_tests/list_graphs.txt

@@ -1,8 +1 @@
-0 100
-0 200
-0 300
-0 1000
-0 10000
-0 20000
-0 50000
-0 100000
+2 100

front/tests/speed_tests/test_speed.cpp

@@ -1,26 +1,34 @@
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <time.h>
-int main()
-{
-    int type = 0, n = 0;
-    clock_t start1, end1, start2, end2;
-    std::ifstream test_list("tests/speed_tests/list_graphs.txt");
-    std::ofstream output("tests/speed_tests/test_speed.output");
-    while(!test_list.eof()) {
-        test_list >> type >> n;
-        system(("python tests/speed_tests/graph_generator.py " + std::to_string(type) + " " + std::to_string(n)).c_str());
-        start1 = clock();   // remember start clock
-        system("(build/core graph_generator.output -fast) 2>> save.out");
-        end1 = clock();     // remember end clock
-        output << std::endl << std::endl;
-
-        start2 = clock();   // remember start clock
-        system("(build/core graph_generator.output -slow) 2>> save.out");
-        end2 = clock();     // remember end clock
-        output << type << " " << n << " " << static_cast<double>(end1 - start1) / CLOCKS_PER_SEC << " " << static_cast<double>(end2 - start2) / CLOCKS_PER_SEC << std::endl;// write start-end clock
-        output << start1 << " " << end1 << " " << start2 << " " << end2 << std::endl << std::endl;// write start-end clock
-    }
-    test_list.close();
-}
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <time.h>
+int main()
+{
+    int type = 0, n = 0;
+    clock_t start1, end1, start2, end2, start3, end3, start4, end4;
+    std::ifstream test_list("tests/speed_tests/list_graphs.txt");
+    std::ofstream output("tests/speed_tests/test_speed.output");
+    //while(!test_list.eof()) {
+        //test_list >> type >> n;
+        n = 10;
+        system(("python tests/speed_tests/graph_generator.py " + std::to_string(type) + " " + std::to_string(n)).c_str());
+        start1 = clock();   // remember start clock
+        //system("(build/core graph_generator.output -fast) 2>> save.out");
+        end1 = clock();     // remember end clock
+        output << std::endl << std::endl;
+
+        start2 = clock();   // remember start clock
+        //system("(build/core graph_generator.output -slow) 2>> save.out");
+        end2 = clock();     // remember end clock
+        output << std::endl << std::endl;
+        
+        start3 = clock();   // remember start clock
+        system("(build/core graph_generator.output -spaced_rhs -iguana) 2>> save.out");
+        end3 = clock();     // remember end clock
+        output << std::endl << std::endl;
+        
+        output << type << " " << n << " " << static_cast<double>(end1 - start1) / CLOCKS_PER_SEC << " " << static_cast<double>(end2 - start2) / CLOCKS_PER_SEC << " " << static_cast<double>(end3 - start3) / CLOCKS_PER_SEC << std::endl;// write start-end clock
+        output << start1 << " " << end1 << " " << start2 << " " << end2 << " " << start3 << " " << end3 << std::endl << std::endl;// write start-end clock
+    //}
+    test_list.close();
+}

front/tests/speed_tests/test_speed.output

@@ -0,0 +1,4 @@
+
+
+
+

front/tests/speed_tests/test_speed1.cpp

@@ -0,0 +1,32 @@
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <time.h>
+#include <chrono>
+int main()
+{
+    int type = 0, n = 0;
+    std::ifstream test_list("tests/speed_tests/list_graphs.txt");
+    std::ofstream output("tests/speed_tests/test_speed.output");
+    while(!test_list.eof()) {
+        test_list >> type >> n;
+        system(("python tests/speed_tests/graph_generator.py " + std::to_string(type) + " " + std::to_string(n)).c_str());
+        auto start1 = std::chrono::high_resolution_clock::now();   // remember start clock
+        //system("(build/core tests/speed_tests/graph_generator -fast) 2>> save.out");
+        auto end1 = std::chrono::high_resolution_clock::now();     // remember end clock
+        output << std::endl << std::endl;
+
+        auto start2 = std::chrono::high_resolution_clock::now();   // remember start clock
+        //system("(build/core tests/speed_tests/graph_generator -slow) 2>> save.out");
+        auto end2 = std::chrono::high_resolution_clock::now();    // remember end clock
+        output << std::endl << std::endl;
+        
+        auto start3 = std::chrono::high_resolution_clock::now();   // remember start clock
+        system("(build/core tests/speed_tests/graph_generator -spaced_rhs -iguana) > save.out");
+        auto end3 = std::chrono::high_resolution_clock::now();     // remember end clock
+        output << std::endl << std::endl;
+        
+	output << type << " " << n << " " << std::chrono::duration_cast<std::chrono::microseconds>(end1 - start1).count() << " " << std::chrono::duration_cast<std::chrono::microseconds>(end2 - start2).count() << " " << std::chrono::duration_cast<std::chrono::microseconds>(end3 - start3).count() << std::endl;
+    }
+    test_list.close();
+}

front/tests/test.cpp

@@ -292,7 +292,7 @@ TEST_CASE("test_transl_core") {
         system(("build/transl tests/test_transl_core/" + test_graph_name).c_str());
 	s = test_graph_name.substr(0, test_graph_name.rfind("."));
 	system(("build/to_core tests/test_transl_core/.main" + s + ".dot").c_str());
-	system(("build/core tests/test_transl_core/graph" + s + " -spaced_rhs -fast > tests/test_transl_core/output" + s).c_str());
+	system(("build/core tests/test_transl_core/graph" + s + " -spaced_rhs -iguana > tests/test_transl_core/output" + s).c_str());
     }
     test_list.close();
 }