Fix cpp tracers

64json · 64json · commit 2dbde0567b40 · 2018-07-22T11:46:17.000+09:00
diff --git a/builders/cpp.js b/builders/cpp.js
@@ -16,7 +16,7 @@ ${tracer.methods.filter(method => method.return !== 'new').map(method => {
     for (let i = 0; i <= optionals.length; i++) {
       const args = method.arguments.slice(0, method.arguments.length - i);
       definitions.push(`
-    ${method.return} *${method.name}(${args.map(argument => `json ${argument.name}`).join(', ')});`);
+    ${method.return} ${method.name}(${args.map(argument => `json ${argument.name}`).join(', ')});`);
     }
     return definitions.join('\n');
   }).join('\n')}
@@ -38,9 +38,9 @@ ${tracer.methods.filter(method => method.return !== 'new').map(method => {
     for (let i = 0; i <= optionals.length; i++) {
       const args = method.arguments.slice(0, method.arguments.length - i);
       definitions.push(`
-${tracer.name} *${tracer.name}::${method.name}(${args.map(argument => `json ${argument.name}`).join(', ')}) {
+${tracer.name} ${tracer.name}::${method.name}(${args.map(argument => `json ${argument.name}`).join(', ')}) {
     addTrace(key, "${method.name}", json::array({${args.map(argument => argument.name).join(', ')}}));
-    return this;
+    return *this;
 }`);
     }
     return definitions.join('\n');
@@ -55,7 +55,7 @@ project(tracers)
 
 set(CMAKE_CXX_STANDARD 11)
 
-add_library(tracers Randomize.h Tracer.cpp Tracer.h ${tracers.map(tracer => `${tracer.name}.cpp ${tracer.name}.h`).join(' ')})
+add_library(tracers Tracer.cpp ${tracers.map(tracer => `${tracer.name}.cpp`).join(' ')})
 
 set_target_properties(tracers
     PROPERTIES
diff --git a/languages/cpp/src/Tracer.cpp b/languages/cpp/src/Tracer.cpp
@@ -1,5 +1,5 @@
 #include <string>
-#include <iostream>
+#include <fstream>
 #include <json.hpp>
 #include "Tracer.h"
 
@@ -32,7 +32,9 @@ Tracer::Tracer(string className, string title) {
 }
 
 void Tracer::onExit() {
-    cout << traces.dump(2);
+    ofstream fout("traces.json");
+    fout << traces.dump();
+    fout.close();
 }
 
 int init() {
diff --git a/languages/cpp/test/main.cpp b/languages/cpp/test/main.cpp
@@ -1,6 +1,7 @@
 #include <string>
 #include <iostream>
 #include "LogTracer.h"
+#include "GraphTracer.h"
 #include "Randomize.h"
 
 using namespace std;
@@ -9,12 +10,8 @@ using namespace Randomize;
 int main() {
     int N = 5;
     int **graph = Graph<int>(N, .5, *(new Integer(1, 5))).weighted(true).directed(false).create();
-    for (int i = 0; i < N; i++) {
-        for (int j = 0; j < N; j++) {
-            cout << graph[i][j] << " ";
-        }
-        cout << endl;
-    }
-//    int **arr = randomizer->create();
+    GraphTracer graphTracer;
+    int arr[][2] = {{0, 1}, {1, 0}};
+    graphTracer.set(arr);
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include <string>`
`2`		`-#include <iostream>`
	`2`	`+#include <fstream>`
`3`	`3`	`#include <json.hpp>`
`4`	`4`	`#include "Tracer.h"`
`5`	`5`
`@@ -32,7 +32,9 @@ Tracer::Tracer(string className, string title) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`void Tracer::onExit() {`
`35`		`- cout << traces.dump(2);`
	`35`	`+ ofstream fout("traces.json");`
	`36`	`+ fout << traces.dump();`
	`37`	`+ fout.close();`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`int init() {`