Working port and warp save/load from YAML.

We're able to get the data from CIM. (ports/warps).
We're able to get data from moving around.

director.cpp

@@ -351,6 +351,14 @@ void Director::SL_cimline(const std::string &line) {
 
   // if (pos == line.npos) {
   if (in(line, "%")) {
+    // portcim
+    struct port p = parse_portcim(line);
+    if (p.sector == 0)
+      BUGZ_LOG(fatal) << "portcim:  FAIL [" << line << "]";
+    else
+      BUGZ_LOG(fatal) << "portcim: " << p;
+    galaxy.add_port(p);    
+  } else {
     // warpcim
     BUGZ_LOG(fatal) << "warpcim: [" << line << "]";
     auto warps = split(line);
@@ -364,14 +372,6 @@ void Director::SL_cimline(const std::string &line) {
     }
     BUGZ_LOG(fatal) << "warpcim: " << sw;
     galaxy.add_warp(sw);
-  } else {
-    // portcim
-    struct port p = parse_portcim(line);
-    if (p.sector == 0)
-      BUGZ_LOG(fatal) << "portcim:  FAIL [" << line << "]";
-    else
-      BUGZ_LOG(fatal) << "portcim: " << p;
-    galaxy.add_port(p);
   }
 }
 
@@ -413,6 +413,7 @@ void Director::SL_sectorline(const std::string &line) {
        pos += 8;
        int class_ = stoi(line.substr(pos));
        BUGZ_LOG(fatal) << "PORT: " << class_;
+       galaxy.add_port(current_sector, class_);
      }
    }
    if (in(line, "Warps to Sector(s) :")) {

galaxy.cpp

@@ -3,10 +3,10 @@
 #include <algorithm>  // sort
 #include <boost/format.hpp>
 #include <exception>
+#include <fstream>
 #include <ostream>
 #include <set>
 #include <string>
-#include <fstream>
 
 #include "logging.h"
 #include "yaml-cpp/yaml.h"
@@ -44,12 +44,26 @@ std::ostream &operator<<(std::ostream &os, const port &p) {
   return os;
 }
 
+/*
+// adding this breaks test-galaxy's port = {2, 2, {1,2,3}, {1,2,3}} code.
+port::port() {
+  sector = 0;
+  type = 0;
+  for (int x = 0; x < 3; x++) {
+    amount[x] = 0;
+    percent[x] = 0;
+  }
+}
+*/
+
 sector_warps::sector_warps() {
   sector = 0;
-  for (int x = 0; x < MAX_WARPS; ++x) warps[x] = 0;
+  // for (int x = 0; x < MAX_WARPS; ++x) warps[x] = 0;
 }
 
 void sector_warps::add(sector_type new_sector) {
+  warps.insert(new_sector);
+  /*
   for (int x = 0; x < MAX_WARPS; ++x) {
     if (warps[x] == new_sector) return;
     if (warps[x] == 0) {
@@ -60,19 +74,31 @@ void sector_warps::add(sector_type new_sector) {
   std::string message = str(boost::format("More then MAX %1% sectors for %2%") %
                             MAX_WARPS % (int)sector);
   throw std::out_of_range(message);
+  */
 }
 
 std::ostream &operator<<(std::ostream &os, const sector_warps &warps) {
   os << "Sector: " << warps.sector << " ";
+  bool comma = false;
+  for (auto const &warp : warps.warps) {
+    if (comma)
+      os << ",";
+    else
+      comma = true;
+    os << warp;
+  }
+  /*
   for (int x = 0; x < MAX_WARPS; ++x) {
     if (warps.warps[x] != 0) {
       if (x != 0) os << ",";
       os << warps.warps[x];
     }
   }
+  */
   return os;
 }
 
+#ifdef NOT_SET
 bool sector_sort(sector_type st1, sector_type st2) {
   /* Sort sectors, put 0's at the end. */
   if (st1 == 0) return false;
@@ -108,9 +134,10 @@ bool sector_warps::operator==(const sector_warps &rhs) const {
   // sector number doesn't match!
   return false;
 }
+#endif
 
 #define GTEST_COUT std::cerr << "[          ] [ INFO ]"
-// #define GTEST_DEBUG
+#define GTEST_DEBUG
 
 struct port parse_portcim(const std::string line) {
   struct port p;
@@ -192,12 +219,12 @@ void Galaxy::add_warp(sector_warps sw) {
 
   if (pos == warps.end()) {
     // not found
-    sw.sort();
+    // sw.sort();
     warps[sw.sector] = sw;
     BUGZ_LOG(info) << "add_warp NEW " << sw.sector;
   } else {
     // found!
-    if (pos->second == sw) {
+    if (pos->second.warps == sw.warps) {
       BUGZ_LOG(trace) << "add_warp: Yup, I already know about " << sw.sector;
     } else {
       BUGZ_LOG(info) << "add_warp:  Warps don't match! Updating...";
@@ -208,8 +235,51 @@ void Galaxy::add_warp(sector_warps sw) {
   }
 }
 
-void Galaxy::add_port(sector_type sector, int port_class) {}
-void Galaxy::add_port(port p) {}
+void Galaxy::add_port(sector_type sector, int port_class) {
+  auto pos = ports.find(sector);
+  if (pos == ports.end()) {
+    // no such port.
+    port p;
+    p.sector = sector;
+    p.type = port_class;
+    for( int x= 0; x < 3; x++) {
+      p.amount[x ] = 0;
+      p.percent[x] = 0;
+    }
+    BUGZ_LOG(info) << "add_port: " << sector << ", " << port_class << " : " << p;
+    ports[sector] = p;
+  } else {
+    // port was found, so:
+    if ( pos->second.type == port_class) {
+      BUGZ_LOG(info) << "add_port: Yup, port " << sector << " is class " << port_class;
+    } else {
+      BUGZ_LOG(fatal) << "add_port: " << sector << " shows " << pos->second.type << " >> set to " << port_class;
+    }
+  }
+}
+
+void Galaxy::add_port(port p) {
+  auto pos = ports.find(p.sector);
+  if (pos == ports.end()) {
+    BUGZ_LOG(info) << "add_port: NEW " << p;
+    ports[p.sector] = p;
+  } else {
+    if (pos->second.type != p.type) {
+      if ( (pos->second.type == 9) && (p.type == 8) ) {
+        BUGZ_LOG(info) << "add_port: StarDock " << p.sector;
+        p.type = 9;
+        ports[p.sector] = p;
+      } else {
+        BUGZ_LOG(fatal) << "add_port: " << pos->second << " NEW : " << p;
+        ports[p.sector] = p;
+      }
+    } else {
+      BUGZ_LOG(info) << "add_port: Yup " << p.sector;
+    }
+  }
+}
+
+#ifdef NO_NOT_EVER
 
 namespace YAML {
 template <>
@@ -277,6 +347,8 @@ struct convert<Galaxy> {
 };
 }  // namespace YAML
 
+#endif
+
 void Galaxy::load(void) {
   std::string filename =
       str(boost::format("galaxy-%1%-%2%.json") % game % username);
@@ -286,11 +358,52 @@ void Galaxy::load(void) {
   warps.clear();
   if (file_exists(filename)) {
     YAML::Node data = YAML::LoadFile(filename);
-    Galaxy g = data["galaxy"].as<Galaxy>();
-    BUGZ_LOG(fatal) << "YAML: config keys: " << g.config.size();
-    BUGZ_LOG(fatal) << "YAML:   warp keys: " << g.warps.size();
-    BUGZ_LOG(fatal) << "YAML:   port keys: " << g.ports.size();
-    // *this = data.as<Galaxy>();
+    if (data["config"]) {
+    } else {
+      BUGZ_LOG(fatal) << "YAML Missing config section.";
+    }
+    if (data["ports"]) {
+      const YAML::Node ports = data["ports"];
+      for (auto const &port_iter : ports) {
+        port p;
+        p.sector = port_iter.first.as<int>();
+        p.type = port_iter.second["class"].as<int>();
+        int x = 0;
+        for (auto const &amount : port_iter.second["amount"]) {
+          p.amount[x] = amount.as<int>();
+          ++x;
+        }
+        x = 0;
+        for (auto const &pct : port_iter.second["pct"]) {
+          p.percent[x] = pct.as<int>();
+          ++x;
+        }
+        add_port(p);
+      }
+    } else {
+      BUGZ_LOG(fatal) << "YAML Missing ports section.";
+    }
+    if (data["warps"]) {
+      const YAML::Node &warps = data["warps"];
+      // if (warps.IsMap()) {
+      for (auto const warp_iter : warps) {
+        sector_warps sw;
+        sw.sector = warp_iter.first.as<int>();
+        for (auto const sector_iter : warp_iter.second) {
+          sw.add(sector_iter.as<int>());
+        }
+        BUGZ_LOG(fatal) << "YAML warp: " << sw;
+        add_warp(sw);
+      }
+      // }
+    } else {
+      BUGZ_LOG(fatal) << "YAML Missing warps section.";
+    }
+
+    BUGZ_LOG(fatal) << "YAML: config keys: " << config.size();
+    BUGZ_LOG(fatal) << "YAML:   warp keys: " << warps.size();
+    BUGZ_LOG(fatal) << "YAML:   port keys: " << ports.size();
+
   } else {
     BUGZ_LOG(fatal) << "Missing YAML: " << filename;
   }
@@ -300,7 +413,37 @@ void Galaxy::save(void) {
   std::string filename =
       str(boost::format("galaxy-%1%-%2%.json") % game % username);
   YAML::Node data;
-  data["galaxy"] = *this;
+  BUGZ_LOG(fatal) << "YAML config: " << config.size();
+  for (auto const &config_iter : config) {
+    data["config"][config_iter.first] = config_iter.second;
+  }
+  BUGZ_LOG(fatal) << "YAML warps: " << warps.size();
+  for (auto const &warp : warps) {
+    for (auto const &sector : warp.second.warps) {
+      data["warps"][warp.first].push_back(sector);
+    }
+    /*
+    for (int x = 0; x < MAX_WARPS; ++x) {
+      if (warp.second.warps[x] == 0) break;
+      data["warps"][warp.first].push_back(warp.second.warps[x]);
+    }
+    */
+  }
+  BUGZ_LOG(fatal) << "YAML ports: " << ports.size();
+  /*
+  When saving to yaml, my sector_type is like char.  So, it wants
+  to save the values as a character.  Cast to int.
+   */
+  for (auto const &port : ports) {
+    data["ports"][port.second.sector]["class"] = (int)port.second.type;
+    for (int x = 0; x < 3; x++) {
+      data["ports"][port.second.sector]["amount"].push_back(
+          (int)port.second.amount[x]);
+      data["ports"][port.second.sector]["pct"].push_back(
+          (int)port.second.percent[x]);
+    }
+  }
+
   std::ofstream fout(filename);
   fout << data << std::endl;
   BUGZ_LOG(fatal) << "YAML: " << filename;

galaxy.h

@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-
+#include <set>
 
 enum PRODUCT { FUEL = 0, ORG = 1, EQUIP = 2 };
 
@@ -32,14 +32,15 @@ struct buysell_text {
   friend std::ostream& operator<<(std::ostream& os, const buysell_text& bst);
 };
 
-#define MAX_WARPS 6
+// #define MAX_WARPS 6
 
 typedef uint16_t sector_type;
 
 struct sector_warps {
   sector_type sector;  // Yes, for debug
   // std::set<sector_type> warps;  // possibly
-  sector_type warps[MAX_WARPS];
+  std::set<sector_type> warps;
+  // sector_type warps[MAX_WARPS];
   // ports
   // planets
   // ctor that zeros everything out?
@@ -47,8 +48,8 @@ struct sector_warps {
   void add(sector_type sector);
   // add() that adds warp to end of warps?
   friend std::ostream& operator<<(std::ostream& os, const sector_warps& warps);
-  bool operator==(const sector_warps& rhs) const;
-  void sort(void);
+  // bool operator==(const sector_warps& rhs) const;
+  // void sort(void);
 };
 
 /*
@@ -154,6 +155,7 @@ struct port {
   uint8_t type;
   uint16_t amount[3];
   uint8_t percent[3];
+  // port();
   friend std::ostream& operator<<(std::ostream& os, const port& p);
 };
 

test-galaxy.cpp

@@ -92,21 +92,29 @@ TEST(ports, parse_portcim) {
   // THis was copied directly from client (indentation may be off)
   std::map<std::string, port> data = {
       {"  2 - 2420 100%    612  35% - 2020 100% ", // BSB
-       {2, 2, {2420, 612, 2020}, {100, 35, 100}}},
+       {2, 2, {2420, 612, 2020}, {100, 35, 100}}
+       },
       {"  4 - 2880 100% -  275  23%     61   6% ", // BBS
        {4, 1, {2880, 275, 61}, {100, 23, 6}}},
       {"  6 -  820 100%   1952  89% - 2680 100% ", // BSB
-       {6, 2, {820, 1952, 2680}, {100, 89, 100}}},
+       {6, 2, {820, 1952, 2680}, {100, 89, 100}}
+       },
       {"  8 - 1000 100% -  855  85% - 1000 100% ", // BBB
-       {8, 8, {1000, 855, 1000}, {100, 85, 100}}},
+       {8, 8, {1000, 855, 1000}, {100, 85, 100}}
+       },
       {" 20 - 1708  97% -  710  56%    287  15% ", // BBS
-       {20, 1, {1708, 710, 287}, {97, 56, 15}}},
+       {20, 1, {1708, 710, 287}, {97, 56, 15}}
+       },
       {" 23 - 2120 100% -  709  40%   1902  69% ", // BBS
-       {23, 1, {2120, 709, 1902}, {100, 40, 69}}},
+       {23, 1, {2120, 709, 1902}, {100, 40, 69}}
+       },
       {" 28   1511  98% -  478  29%    589  35% ", // SBS
-       {28, 5, {1511, 478, 589}, {98, 29, 35}}},
+       {28, 5, {1511, 478, 589}, {98, 29, 35}}
+       },
       {" 29    913  56% -  970 100% - 1990 100% ", // SBB
-       {29, 3, {913, 970, 1990}, {56, 100, 100}}}};
+       {29, 3, {913, 970, 1990}, {56, 100, 100}}
+       }
+      };
 
   /*
   // If you could make this a map or something better please improve