Added warps, added class 9 port (StarDock BBB).

galaxy.cpp

@@ -1,6 +1,7 @@
 #include "galaxy.h"
-
+#include <boost/format.hpp>
 #include <ostream>
+#include <string>
 
 bool buysell::operator==(const buysell &rhs) const {
   return ((foe[0] == rhs.foe[0]) && (foe[1] == rhs.foe[1]) &&
@@ -22,7 +23,29 @@ std::ostream &operator<<(std::ostream &os, const buysell_text &bst) {
   return os;
 }
 
+sector_warps::sector_warps() {
+  sector = 0;
+  for (int x = 0; x < MAX_WARPS; ++x)
+    warps[x] = 0;
+}
+
+void sector_warps::add(sector_type new_sector) {
+
+  for (int x = 0; x < MAX_WARPS; ++x) {
+    if (warps[x] == new_sector)
+      return;
+    if (warps[x] == 0) {
+      warps[x] = new_sector;
+      return;
+    }
+  }
+  std::string message = str(boost::format("More then MAX %1% sectors for %2%") %
+                            MAX_WARPS % (int)sector);
+  throw std::out_of_range(message);
+}
+
 #define GTEST_COUT std::cerr << "[          ] [ INFO ]"
+// #define GTEST_DEBUG
 
 struct port parse_portcim(const std::string line) {
   struct port p;
@@ -46,22 +69,26 @@ struct port parse_portcim(const std::string line) {
   // sector + amount pct + amount pct + amount pct
   // 1      2 3      4   5 6      7   8 9      10
 
-  // GTEST_COUT << "Sector: " << p.sector << std::endl;
-  // GTEST_COUT << "Line: [" << line << "]" << std::endl;
+#ifdef GTEST_DEBUG
+  GTEST_COUT << "Sector: " << p.sector << std::endl;
+  GTEST_COUT << "Line: [" << line << "]" << std::endl;
+#endif
 
   buysell port_buysell;
 
   std::smatch matches;
   if (std::regex_match(line, matches, portrx)) {
-      /*
+
+#ifdef GTEST_DEBUG
     for (size_t x = 1; x < matches.size(); ++x) {
       GTEST_COUT << x << " : " << matches[x] << std::endl;
     }
-    */
+#endif
 
     if (matches.size() != 11) {
-      // GTEST_COUT << "Now you have 101 problems." << std::endl;
-
+#ifdef GTEST_DEBUG
+      GTEST_COUT << "Now you have 101 problems." << std::endl;
+#endif
       p.sector = 0;
       p.type = 0;
       return p;
@@ -79,10 +106,14 @@ struct port parse_portcim(const std::string line) {
       p.percent[x] = stoi(matches[pos + 4]);
     }
     p.type = type_from_buysell(port_buysell);
-    // GTEST_COUT << "port is type " << (int)p.type << std::endl;
+#ifdef GTEST_DEBUG
+    GTEST_COUT << "port is type " << (int)p.type << std::endl;
+#endif
     return p;
   } else {
-    // GTEST_COUT << "regex_match failed." << std::endl;
+#ifdef GTEST_DEBUG
+    GTEST_COUT << "regex_match failed." << std::endl;
+#endif
     p.type = 0;
     p.sector = 0;
     return p;

test-galaxy.cpp

@@ -14,7 +14,7 @@ namespace {
 
 std::map<int, const char *> port_classes = {{1, "BBS"}, {2, "BSB"}, {3, "SBB"},
                                             {4, "SSB"}, {5, "SBS"}, {6, "BSS"},
-                                            {7, "SSS"}, {8, "BBB"}};
+                                            {7, "SSS"}, {8, "BBB"}, {9, "BBB"}};
 
 /* From Galaxy.py
 PORT_CLASSES = {
@@ -29,7 +29,7 @@ PORT_CLASSES = {
 }*/
 
 TEST(ports, get_buysell) {
-  for (int type = 1; type < 9; ++type) {
+  for (int type = 1; type < 10; ++type) {
     buysell expected;
     const char *flags;
 
@@ -38,12 +38,13 @@ TEST(ports, get_buysell) {
       expected.foe[x] = flags[x] == 'B';
     buysell result = get_buysell(type);
     for (int x = 0; x < 3; ++x)
-      EXPECT_EQ(result.foe[x], expected.foe[x]) << "type: " << type << " pos: " << x;
+      EXPECT_EQ(result.foe[x], expected.foe[x])
+          << "type: " << type << " pos: " << x;
   }
 }
 
 TEST(ports, text_from_type) {
-  for (int type = 1; type < 9; ++type) {
+  for (int type = 1; type < 10; ++type) {
     buysell_text expected;
     const char *flags;
 
@@ -56,7 +57,7 @@ TEST(ports, text_from_type) {
 }
 
 TEST(ports, text_from_buysell) {
-  for (int type = 1; type < 9; ++type) {
+  for (int type = 1; type < 10; ++type) {
     buysell source = get_buysell(type);
     buysell_text expected;
     const char *flags;
@@ -126,14 +127,16 @@ TEST(ports, parse_portcim) {
 
   for (auto testdata : data) {
     port parse = parse_portcim(testdata.first);
-      EXPECT_EQ((int)parse.sector, (int)testdata.second.sector) << "Text: [" << testdata.first << "]";
-      if (parse.sector != 0) {
+    EXPECT_EQ((int)parse.sector, (int)testdata.second.sector)
+        << "Text: [" << testdata.first << "]";
+    if (parse.sector != 0) {
       EXPECT_EQ(parse.type, testdata.second.type);
       for (int x = 0; x < 3; ++x) {
-        EXPECT_EQ(parse.amount[x], testdata.second.amount[x]) << "Sector:" << parse.sector;
-        EXPECT_EQ(parse.percent[x], testdata.second.percent[x]) << "Sector:" << parse.sector;
+        EXPECT_EQ(parse.amount[x], testdata.second.amount[x])
+            << "Sector:" << parse.sector;
+        EXPECT_EQ(parse.percent[x], testdata.second.percent[x])
+            << "Sector:" << parse.sector;
       }
-
     }
   }
   /*