Changeset 1be100 for src/Graph/Graph6Reader.cpp

Timestamp:

Apr 23, 2021, 8:51:43 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

9171d8

Parents:

d951a5

git-author:

Frederik Heber <frederik.heber@…> (03/27/21 16:54:08)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:51:43)

Message:

FIX: Several small errors in Graph6Reader.

• off-by-one error with encoding starts at 63 (0), not 64.
• cur_byte needs to exist outside of scope of next_edge().
• need a mapping from edges_by_vertices in the subgraph (with indices from the subgraph vertices) to the edge index used in th degrees array to properly calculate the bond degrees.
• TESTS: Added a chemical space evaluator test case with 3 nodes.

File:

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

src/Graph/Graph6Reader.cpp

@@ -57 +57 @@
         if (*_it <126) {
                 //6-bit encoding
-                num_nodes = *_it-64;
+                num_nodes = *_it-63;
         } else if (*_it++ == 126) {
                 unsigned int packets = 3;
@@ -66 +66 @@
                 }
                 for(unsigned int i =0; i<packets*packet_size; ++i) {
-                        unsigned char packet = (*_it++) - 64;
+                        unsigned char packet = (*_it++) - 63;
                         ASSERT(packet<=(1<<(packet_size+1)),
                                         "The input is malformed. "
@@ -84 +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) {
@@ -95 +94 @@
     }
     if (bit_pos<0) {
-      ASSERT((*_it >= 63) && (*_it <= 126),
+      ASSERT(_it != std::istream_iterator<unsigned char>(),
+          "Graph6Reader::next_edge() - less characters than expected in string.");
+      ASSERT((*_it >= 64) && (*_it <= 126),
           "The input contains a non-printable ascii char in the matrix encoding");
       cur_byte = (*_it) - 63;