Changeset 7f17c7 for src/Graph/Graph6Reader.cpp

Timestamp:

Jun 21, 2018, 9:12:49 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Children:

20761c

Parents:

a951f3

git-author:

Frederik Heber <frederik.heber@…> (10/01/17 11:02:10)

git-committer:

Frederik Heber <frederik.heber@…> (06/21/18 09:12:49)

Message:

ChemicalSpaceEvaluator working for graph with 2 nodes.

File:

• src/Graph/Graph6Reader.cpp (modified) (5 diffs)

src/Graph/Graph6Reader.cpp

@@ -36 +36 @@
 //#include "CodePatterns/MemDebug.hpp"
 
-#include <iterator>
-
 #include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Log.hpp"
 
 #include "Graph6Reader.hpp"
@@ -53 +52 @@
 void Graph6Reader::scan_num_nodes(std::istream_iterator<unsigned char> &_it)
 {
-  int packets;
-  int num_nodes;
         //now we're one past the optional header
         //parse the number of nodes
-        ASSERT(*_it >= 63, "The number of nodes is not properly encoded");
+        ASSERT(*_it >= 64, "The number of nodes is not properly encoded");
         if (*_it <126) {
                 //6-bit encoding
-                num_nodes = *_it-63;
+                num_nodes = *_it-64;
         } else if (*_it++ == 126) {
                 unsigned int packets = 3;
@@ -69 +66 @@
                 }
                 for(unsigned int i =0; i<packets*packet_size; ++i) {
-                        unsigned char packet = (*_it++) - 63;
+                        unsigned char packet = (*_it++) - 64;
                         ASSERT(packet<=(1<<(packet_size+1)),
                                         "The input is malformed. "
@@ -87 +84 @@
 void Graph6Reader::next_edge(std::istream_iterator<unsigned char> &_it) {
   unsigned int bit = 0;
+  int cur_byte = 0;
   while(!bit && !eos) {
     if (++row==column) {
@@ -112 +110 @@
   while(!eos) {
     next_edge(_it);
-    edges.push_back(std::make_pair(column,row));
+    if (!eos) {
+      LOG(3, "DEBUG: Adding edge bit in (" << column << "," << row << ")");
+      edges.push_back(std::make_pair(column,row));
+    }
   }
 }