表示を更新

kerikun11 · Apr 26, 2020 · 0fed2ec · 0fed2ec
1 parent 6bb0add
commit 0fed2ec
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/examples/shape/main.cpp b/examples/shape/main.cpp
@@ -44,6 +44,7 @@ void printDefinition(std::ostream &os, const std::string &name,
 void printDefinitions() {
   for (const auto &e : shapes)
     printDefinition(std::cout, e.first, e.second);
+  std::cout << std::endl;
 }
 
 void printCsv(const std::string &filebase, const slalom::Shape &ss,
@@ -97,12 +98,29 @@ void printTrajectory() {
   printCsv("shape/shape_7", shapes[7].second);
 }
 
+void printTable() {
+  for (const auto &e : shapes) {
+    std::cout << "|" << e.first;
+    std::cout << "|" << e.second.total.th / M_PI * 180;
+    std::cout << "|(" << e.second.total.x << "," << e.second.total.y << ")";
+    std::cout << "|(" << e.second.curve.x << "," << e.second.curve.y << ")";
+    std::cout << "|" << e.second.v_ref;
+    std::cout << "|" << e.second.straight_prev;
+    std::cout << "|" << e.second.straight_post;
+    std::cout << "|" << std::endl;
+  }
+  std::cout << std::endl;
+}
+
 int main(void) {
   /* print definitions to stdout */
   printDefinitions();
 
   /* print trajectory to file*/
   printTrajectory();
 
+  /* print result table */
+  printTable();
+
   return 0;
 }
diff --git a/examples/slalom/plot.py b/examples/slalom/plot.py
@@ -47,8 +47,8 @@
 ax.axis('equal')
 ax.grid(which='major', linestyle='-')
 ax.grid(which='minor', linestyle=':')
-ax.legend(['straight', 'transition curve',
-           'pure arc', 'transition curve', 'straight'])
+ax.legend(['straight before curve', 'transition curve',
+           'pure arc', 'transition curve', 'straight after curve'])
 ax.set_xlabel('$x$ [mm]')
 ax.set_ylabel('$y$ [mm]')
 # ax.set_title('')