Changeset 99c705 for src/Graph

Timestamp:

Jun 22, 2018, 7:26:30 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, ChemicalSpaceEvaluator

Children:

d661b2

Parents:

f5ea10

git-author:

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

git-committer:

Frederik Heber <frederik.heber@…> (06/22/18 07:26:30)

Message:

ChemicalSpaceEvaluator working for graph with 2 nodes.

Location:

src/Graph

Files:

• BoostGraphCreator.cpp (modified) (2 diffs)
• Graph6Reader.cpp (modified) (5 diffs)
• Graph6Reader.hpp (modified) (3 diffs)

src/Graph/BoostGraphCreator.cpp

@@ -118 +118 @@
     atomids_nodeids.insert( std::make_pair(vertexname, vertexindex) );
   }
+  LOG(1, "INFO: Added " << reader.get_num_nodes() << " nodes.");
 
   // add edges
@@ -128 +129 @@
     boost::add_edge(leftnodeid, rightnodeid, graph);
   }
+  LOG(1, "INFO: Added " << reader.get_edges().size() << " edges.");
 }
 

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));
+    }
   }
 }

src/Graph/Graph6Reader.hpp

@@ -16 +16 @@
 
 #include <istream>
+#include <iterator>
 #include <string>
 #include <vector>
@@ -34 +35 @@
 
   Graph6Reader() :
-    column(0),
-    row(0),
-    eos(0),
-    bit_pos(0),
-    cur_byte(0),
+    column(1),
+    row(-1),
+    eos(false),
+    bit_pos(-1),
     num_nodes(0)
   {}
@@ -59 +59 @@
   int column;
   int row;
-  int eos;
+  bool eos;
   int bit_pos;
-  int cur_byte;
   static const int packet_size;