[iss-87]

CMakeLists.txt

@@ -97,7 +97,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
 add_custom_target(doc
   COMMAND echo "Generating Project documentation."
   COMMAND doxygen "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"
-  #COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/doc
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/doc
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMENT "Generating API documentation with Doxygen"
 )

algorithms/CMakeLists.txt

@@ -1,10 +1,10 @@
 # Add subdirectories
 add_subdirectory(cc)
-add_subdirectory(cutvertex)
 add_subdirectory(matching)
+add_subdirectory(mfvs)
 add_subdirectory(misc)
-add_subdirectory(partitioner)
+#add_subdirectory(partitioner)
 add_subdirectory(scc)
-add_subdirectory(toposort)
+add_subdirectory(sorting)
 
 install_lib_headers("${CMAKE_CURRENT_SOURCE_DIR}")

algorithms/cc/cc.cpp

@@ -17,10 +17,10 @@
 
  ******************************************************************************/
 
-#include <chrono>
-
 #include "algorithms/cc/cc.hpp"
+#include "sbg/set.hpp"
 #include "util/logger.hpp"
+#include "util/time_profiler.hpp"
 
 namespace SBG {
 
@@ -30,44 +30,46 @@ namespace LIB {
 // Connected components --------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-PWMap connectedComponents(SBG g)
+PWMap connectedComponents(const SBG& sbg)
 {
-  auto begin = std::chrono::high_resolution_clock::now();
+  Util::Internal::TimeProfiler profiler{"Total CC execution time:"};
 
-  if (!g.V().isEmpty()) {
-    PWMap rmap = PW_FACT.createPWMap(g.V()), old_rmap = PW_FACT.createPWMap();
+  Set V = sbg.V();
+  if (!V.isEmpty()) {
+    PWMap rmap{V};
+    PWMap old_rmap;
 
-    if (g.E().isEmpty())
+    if (sbg.E().isEmpty()) {
       return rmap;
+    }
 
+    PWMap map1 = sbg.map1();
+    PWMap map2 = sbg.map2();
     do {
       old_rmap = rmap;
 
-      PWMap ermap1 = rmap.composition(g.map1());
-      PWMap ermap2 = rmap.composition(g.map2());
+      PWMap ermap1 = rmap.composition(map1);
+      PWMap ermap2 = rmap.composition(map2);
 
-      PWMap rmap1 = ermap1.minAdjMap(ermap2);
-      PWMap rmap2 = ermap2.minAdjMap(ermap1);
-      rmap1 = rmap1.combine(rmap);
-      rmap2 = rmap2.combine(rmap);
+      PWMap rmap1 = ermap1.minAdj(ermap2);
+      PWMap rmap2 = ermap2.minAdj(ermap1);
+      rmap1 = std::move(rmap1).combine(rmap);
+      rmap2 = std::move(rmap2).combine(rmap);
 
-      PWMap aux_rmap = rmap1.minMap(rmap2);
-      rmap = rmap.minMap(aux_rmap);
+      PWMap aux_rmap = rmap1.min(rmap2);
+      rmap = rmap.min(aux_rmap);
 
       if (!(rmap == old_rmap)) {
         rmap = aux_rmap;
         rmap = rmap.mapInf();
       }
     } while (rmap != old_rmap); 
 
-    return rmap.compact();
+    rmap.compact();
+    return rmap;
   }
-  auto end = std::chrono::high_resolution_clock::now();
-  auto total = std::chrono::duration_cast<std::chrono::microseconds>(
-    end - begin);
-  Util::SBG_LOG << "Total CC exec time: " << total.count() << "\n";
 
-  return PW_FACT.createPWMap();
+  return PWMap{};
 }
 
 } // namespace LIB

algorithms/cc/cc.hpp

@@ -21,9 +21,10 @@
 
  ******************************************************************************/
 
-#ifndef SBG_CC_HPP
-#define SBG_CC_HPP
+#ifndef SBGRAPH_ALGORITHMS_CC_CC_HPP_
+#define SBGRAPH_ALGORITHMS_CC_CC_HPP_
 
+#include "sbg/pw_map.hpp"
 #include "sbg/sbg.hpp"
 
 namespace SBG {
@@ -34,10 +35,10 @@ namespace LIB {
 // Connected components --------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-PWMap connectedComponents(SBG g);
+PWMap connectedComponents(const SBG& g);
 
 } // namespace LIB
 
 } // namespace SBG
 
-#endif
+#endif // SBGRAPH_ALGORITHMS_CC_CC_HPP_

algorithms/matching/CMakeLists.txt

@@ -4,5 +4,6 @@ target_sources(
         bfs_matching.cpp
         bfs_paths.cpp
         matching.cpp
-        matching_fact.cpp
+        match_data.cpp
+        matching_impl.cpp
 )