Fix synchronizing tracers

64json · 64json · commit cd1d2db11b9f · 2019-01-25T12:07:37.000-05:00
diff --git a/include/Array1DTracer.h b/include/Array1DTracer.h
@@ -2,8 +2,9 @@
 #define CPP_ARRAY1DTRACER_H
 
 #include "Tracer.h"
+#include "ChartTracer.h"
 
-class Array1DTracer : Tracer {
+class Array1DTracer : public Tracer {
 public:
     Array1DTracer(string title = "") : Tracer("Array1DTracer", title) {
     }
@@ -58,8 +59,8 @@ class Array1DTracer : Tracer {
         return *this;
     }
 
-    Array1DTracer chart(json chartTracer) {
-        addTrace(key, "chart", json::array({chartTracer}));
+    Array1DTracer chart(ChartTracer chartTracer) {
+        addTrace(key, "chart", json::array({chartTracer.key}));
         return *this;
     }
 };
diff --git a/include/Array2DTracer.h b/include/Array2DTracer.h
@@ -3,7 +3,7 @@
 
 #include "Tracer.h"
 
-class Array2DTracer : Tracer {
+class Array2DTracer : public Tracer {
 public:
     Array2DTracer(string title = "") : Tracer("Array2DTracer", title) {
     }
diff --git a/include/ChartTracer.h b/include/ChartTracer.h
@@ -3,7 +3,7 @@
 
 #include "Tracer.h"
 
-class ChartTracer : Tracer {
+class ChartTracer : public Tracer {
 public:
     ChartTracer(string title = "") : Tracer("ChartTracer", title) {
     }
@@ -58,8 +58,8 @@ class ChartTracer : Tracer {
         return *this;
     }
 
-    ChartTracer chart(json chartTracer) {
-        addTrace(key, "chart", json::array({chartTracer}));
+    ChartTracer chart(ChartTracer chartTracer) {
+        addTrace(key, "chart", json::array({chartTracer.key}));
         return *this;
     }
 };
diff --git a/include/GraphTracer.h b/include/GraphTracer.h
@@ -2,8 +2,9 @@
 #define CPP_GRAPHTRACER_H
 
 #include "Tracer.h"
+#include "LogTracer.h"
 
-class GraphTracer : Tracer {
+class GraphTracer : public Tracer {
 public:
     GraphTracer(string title = "") : Tracer("GraphTracer", title) {
     }
@@ -233,8 +234,8 @@ class GraphTracer : Tracer {
         return *this;
     }
 
-    GraphTracer log(json logTracer) {
-        addTrace(key, "log", json::array({logTracer}));
+    GraphTracer log(LogTracer logTracer) {
+        addTrace(key, "log", json::array({logTracer.key}));
         return *this;
     }
 };
diff --git a/include/LogTracer.h b/include/LogTracer.h
@@ -4,13 +4,13 @@
 #include <regex>
 #include "Tracer.h"
 
-class LogTracer : Tracer {
+class LogTracer : public Tracer {
 public:
     LogTracer(string title = "") : Tracer("LogTracer", title) {
     }
 
-    LogTracer set(json messages) {
-        addTrace(key, "set", json::array({messages}));
+    LogTracer set(json log) {
+        addTrace(key, "set", json::array({log}));
         return *this;
     }
 
diff --git a/include/Tracer.h b/include/Tracer.h
@@ -37,14 +37,14 @@ class Tracer {
         if (tracerCount > MAX_TRACERS) throw std::overflow_error("Tracers Limit Exceeded");
     }
 
-    string key;
-
     Tracer(string className, string title) {
         if (title.empty()) title = className;
         key = addTracer(className, title);
     }
 
 public:
+    string key;
+
     static size_t writeFunction(void *ptr, size_t size, size_t nmemb, std::string *data) {
         data->append((char *) ptr, size * nmemb);
         return size * nmemb;
diff --git a/test/main.cpp b/test/main.cpp
@@ -11,6 +11,10 @@ int main() {
     int array[N][N];
     Randomize::Graph<int>(N, 1, *(new Randomize::Integer(1, 9))).weighted().directed(false).fill(&array[0][0]);
     GraphTracer graphTracer;
+    LogTracer logTracer;
     graphTracer.set(array);
+    graphTracer.log(logTracer);
+    graphTracer.visit(1, 0);
+    graphTracer.visit(1, 2);
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`	`#define CPP_ARRAY1DTRACER_H`
`3`	`3`
`4`	`4`	`#include "Tracer.h"`
	`5`	`+#include "ChartTracer.h"`
`5`	`6`
`6`		`-class Array1DTracer : Tracer {`
	`7`	`+class Array1DTracer : public Tracer {`
`7`	`8`	`public:`
`8`	`9`	`Array1DTracer(string title = "") : Tracer("Array1DTracer", title) {`
`9`	`10`	`}`
`@@ -58,8 +59,8 @@ class Array1DTracer : Tracer {`
`58`	`59`	`return *this;`
`59`	`60`	`}`
`60`	`61`
`61`		`- Array1DTracer chart(json chartTracer) {`
`62`		`- addTrace(key, "chart", json::array({chartTracer}));`
	`62`	`+ Array1DTracer chart(ChartTracer chartTracer) {`
	`63`	`+ addTrace(key, "chart", json::array({chartTracer.key}));`
`63`	`64`	`return *this;`
`64`	`65`	`}`
`65`	`66`	`};`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "Tracer.h"`
`5`	`5`
`6`		`-class Array2DTracer : Tracer {`
	`6`	`+class Array2DTracer : public Tracer {`
`7`	`7`	`public:`
`8`	`8`	`Array2DTracer(string title = "") : Tracer("Array2DTracer", title) {`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "Tracer.h"`
`5`	`5`
`6`		`-class ChartTracer : Tracer {`
	`6`	`+class ChartTracer : public Tracer {`
`7`	`7`	`public:`
`8`	`8`	`ChartTracer(string title = "") : Tracer("ChartTracer", title) {`
`9`	`9`	`}`
`@@ -58,8 +58,8 @@ class ChartTracer : Tracer {`
`58`	`58`	`return *this;`
`59`	`59`	`}`
`60`	`60`
`61`		`- ChartTracer chart(json chartTracer) {`
`62`		`- addTrace(key, "chart", json::array({chartTracer}));`
	`61`	`+ ChartTracer chart(ChartTracer chartTracer) {`
	`62`	`+ addTrace(key, "chart", json::array({chartTracer.key}));`
`63`	`63`	`return *this;`
`64`	`64`	`}`
`65`	`65`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`	`#define CPP_GRAPHTRACER_H`
`3`	`3`
`4`	`4`	`#include "Tracer.h"`
	`5`	`+#include "LogTracer.h"`
`5`	`6`
`6`		`-class GraphTracer : Tracer {`
	`7`	`+class GraphTracer : public Tracer {`
`7`	`8`	`public:`
`8`	`9`	`GraphTracer(string title = "") : Tracer("GraphTracer", title) {`
`9`	`10`	`}`
`@@ -233,8 +234,8 @@ class GraphTracer : Tracer {`
`233`	`234`	`return *this;`
`234`	`235`	`}`
`235`	`236`
`236`		`- GraphTracer log(json logTracer) {`
`237`		`- addTrace(key, "log", json::array({logTracer}));`
	`237`	`+ GraphTracer log(LogTracer logTracer) {`
	`238`	`+ addTrace(key, "log", json::array({logTracer.key}));`
`238`	`239`	`return *this;`
`239`	`240`	`}`
`240`	`241`	`};`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`#include <regex>`
`5`	`5`	`#include "Tracer.h"`
`6`	`6`
`7`		`-class LogTracer : Tracer {`
	`7`	`+class LogTracer : public Tracer {`
`8`	`8`	`public:`
`9`	`9`	`LogTracer(string title = "") : Tracer("LogTracer", title) {`
`10`	`10`	`}`
`11`	`11`
`12`		`- LogTracer set(json messages) {`
`13`		`- addTrace(key, "set", json::array({messages}));`
	`12`	`+ LogTracer set(json log) {`
	`13`	`+ addTrace(key, "set", json::array({log}));`
`14`	`14`	`return *this;`
`15`	`15`	`}`
`16`	`16`