Changes in src/Fragmentation/Graph.cpp [94d5ac6:b4f72c]

File:

• src/Fragmentation/Graph.cpp (modified) (6 diffs)

src/Fragmentation/Graph.cpp

@@ -64 +64 @@
  * \param *counter keyset counter that gets increased
  */
-void Graph::InsertGraph(Graph &graph, int *counter)
+void Graph::InsertGraph(const Graph &graph, int &counter)
 {
   GraphTestPair testGraphInsert;
 
-  for(Graph::iterator runner = graph.begin(); runner != graph.end(); runner++) {
-    testGraphInsert = insert(GraphPair ((*runner).first,pair<int,double>((*counter)++,((*runner).second).second)));  // store fragment number and current factor
+  for(Graph::const_iterator runner = graph.begin(); runner != graph.end(); runner++) {
+    testGraphInsert = insert(GraphPair ((*runner).first,pair<int,double>(++counter,((*runner).second).second)));  // store fragment number and current factor
     if (testGraphInsert.second) {
-      LOG(2, "INFO: KeySet " << (*counter)-1 << " successfully inserted.");
+      LOG(2, "INFO: KeySet " << counter-1 << " successfully inserted.");
     } else {
-      LOG(2, "INFO: KeySet " << (*counter)-1 << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first);
+      LOG(2, "INFO: KeySet " << counter-1 << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first);
       ((*(testGraphInsert.first)).second).second += (*runner).second.second;
       LOG(2, "INFO: New factor is " << (*(testGraphInsert.first)).second.second << ".");
@@ -132 +132 @@
  * \return true - file written successfully, false - writing failed
  */
-bool Graph::StoreKeySetFile(std::string &path)
+bool Graph::StoreKeySetFile(std::string &path) const
 {
   bool status =  true;
@@ -141 +141 @@
   LOG(1, "INFO: Saving key sets of the total graph ... ");
   if(output.good()) {
-    for(Graph::iterator runner = begin(); runner != end(); runner++) {
-      for (KeySet::iterator sprinter = (*runner).first.begin();sprinter != (*runner).first.end(); sprinter++) {
+    for(Graph::const_iterator runner = begin(); runner != end(); runner++) {
+      for (KeySet::const_iterator sprinter = (*runner).first.begin();sprinter != (*runner).first.end(); sprinter++) {
         if (sprinter != (*runner).first.begin())
           output << "\t";
@@ -156 +156 @@
   }
   output.close();
-  output.clear();
 
   return status;
@@ -210 +209 @@
  * \return true - file written successfully, false - writing failed
  */
-bool Graph::StoreTEFactorsFile(char *path)
+bool Graph::StoreTEFactorsFile(char *path) const
 {
   ofstream output;
@@ -224 +223 @@
   LOG(1, "INFO: Saving TEFactors of the total graph ... ");
   if(output != NULL) {
-    for(Graph::iterator runner = begin(); runner != end(); runner++)
+    for(Graph::const_iterator runner = begin(); runner != end(); runner++)
       output << (*runner).second.second << endl;
     LOG(1, "INFO: done." << endl);