Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit cd1d2db

Browse files
committed
Fix synchronizing tracers
1 parent 35eb91c commit cd1d2db

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

‎include/Array1DTracer.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
#define CPP_ARRAY1DTRACER_H
33

44
#include "Tracer.h"
5+
#include "ChartTracer.h"
56

6-
class Array1DTracer : Tracer {
7+
class Array1DTracer : publicTracer {
78
public:
89
Array1DTracer(string title = "") : Tracer("Array1DTracer", title) {
910
}
@@ -58,8 +59,8 @@ class Array1DTracer : Tracer {
5859
return *this;
5960
}
6061

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}));
6364
return *this;
6465
}
6566
};

‎include/Array2DTracer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "Tracer.h"
55

6-
class Array2DTracer : Tracer {
6+
class Array2DTracer : publicTracer {
77
public:
88
Array2DTracer(string title = "") : Tracer("Array2DTracer", title) {
99
}

‎include/ChartTracer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "Tracer.h"
55

6-
class ChartTracer : Tracer {
6+
class ChartTracer : publicTracer {
77
public:
88
ChartTracer(string title = "") : Tracer("ChartTracer", title) {
99
}
@@ -58,8 +58,8 @@ class ChartTracer : Tracer {
5858
return *this;
5959
}
6060

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}));
6363
return *this;
6464
}
6565
};

‎include/GraphTracer.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
#define CPP_GRAPHTRACER_H
33

44
#include "Tracer.h"
5+
#include "LogTracer.h"
56

6-
class GraphTracer : Tracer {
7+
class GraphTracer : publicTracer {
78
public:
89
GraphTracer(string title = "") : Tracer("GraphTracer", title) {
910
}
@@ -233,8 +234,8 @@ class GraphTracer : Tracer {
233234
return *this;
234235
}
235236

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}));
238239
return *this;
239240
}
240241
};

‎include/LogTracer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#include <regex>
55
#include "Tracer.h"
66

7-
class LogTracer : Tracer {
7+
class LogTracer : publicTracer {
88
public:
99
LogTracer(string title = "") : Tracer("LogTracer", title) {
1010
}
1111

12-
LogTracer set(json messages) {
13-
addTrace(key, "set", json::array({messages}));
12+
LogTracer set(json log) {
13+
addTrace(key, "set", json::array({log}));
1414
return *this;
1515
}
1616

‎include/Tracer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ class Tracer {
3737
if (tracerCount > MAX_TRACERS) throw std::overflow_error("Tracers Limit Exceeded");
3838
}
3939

40-
string key;
41-
4240
Tracer(string className, string title) {
4341
if (title.empty()) title = className;
4442
key = addTracer(className, title);
4543
}
4644

4745
public:
46+
string key;
47+
4848
static size_t writeFunction(void *ptr, size_t size, size_t nmemb, std::string *data) {
4949
data->append((char *) ptr, size * nmemb);
5050
return size * nmemb;

‎test/main.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ int main() {
1111
int array[N][N];
1212
Randomize::Graph<int>(N, 1, *(new Randomize::Integer(1, 9))).weighted().directed(false).fill(&array[0][0]);
1313
GraphTracer graphTracer;
14+
LogTracer logTracer;
1415
graphTracer.set(array);
16+
graphTracer.log(logTracer);
17+
graphTracer.visit(1, 0);
18+
graphTracer.visit(1, 2);
1519
return 0;
1620
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /