Fix synchronizing tracers

Author: 64json

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;
     }
 };

include/Array2DTracer.h

@@ -3,7 +3,7 @@
 
 #include "Tracer.h"
 
-class Array2DTracer : Tracer {
+class Array2DTracer : public Tracer {
 public:
     Array2DTracer(string title = "") : Tracer("Array2DTracer", title) {
     }

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;
     }
 };

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;
     }
 };

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;
     }
 

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;

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;
 }