Merge pull request #1 from fmoessbauer/feat-cleanup

Major cleanup and re-structuring
fmoessbauer · Oct 26, 2018 · 0b13751 · 0b13751
2 parents 0bf85ec + c9d0638
commit 0b13751
Show file tree

Hide file tree

Showing 41 changed files with 221 additions and 422 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,43 +1,59 @@
 version: 2
 jobs:
-  build_gcc:
-    docker:
-      - image: thoughton/gcc-cmake:latest
-    steps:
-      - checkout
-      - run: git submodule update --init --recursive --remote
-      - run: bash build.sh
-      - run: ./build/test/LibMVC-test data/frb30-15-mis/frb30-15-1.mis 420 450 10
   coverage:
     docker:
-      - image: thoughton/gcc-cmake:latest
+      - image: ubuntu:latest
     steps:
-      - run: apt update && apt install lcov gcovr -y
+      - run: apt update && apt install git curl build-essential ninja-build meson lcov gcovr -y
       - checkout
-      - run: git submodule update --init --recursive --remote
-      - run: bash build.cov.sh
-      - run: cd build.cov && make LibMVC-test-coverage
+      - run: meson -Db_coverage=true build.cov
+      - run: cd build.cov && ninja
+      - run: cd build.cov && ninja test
+      - run: cd build.cov && ninja coverage-xml
       - run: bash <(curl -s https://codecov.io/bash)
       - store_artifacts:
-          path: build.cov/LibMVC-test-coverage.xml
+          path: build.cov/build.cov/meson-logs/coverage.xml
           prefix: coverage
-  meson:
+      - store_artifacts:
+          path: build.cov/meson-logs
+
+  gcc:
     docker:
       - image: ubuntu:latest
     steps:
       - run: apt update && apt install git build-essential ninja-build meson -y
       - checkout
-      - run: git submodule update --init --recursive --remote
-      - run: meson build
+      - run: meson build --warnlevel 3 --werror --prefix=/opt/libmvc
+      - run: cd build && ninja
+      - run: cd build && ninja test
+      - run: cd build && ninja benchmark
+      # install and run standalone solvers
+      - run: cd build && ninja install
+      - run: /opt/libmvc/bin/NuMVC-standalone data/frb30-15-mis/frb30-15-1.mis 420 100
+      - run: /opt/libmvc/bin/FastVC-standalone data/frb30-15-mis/frb30-15-1.mis 420 100
+      - run: /opt/libmvc/bin/NuMVC-parallel-standalone data/frb30-15-mis/frb30-15-1.mis 420 100
+      - run: /opt/libmvc/bin/FastVC-parallel-standalone data/frb30-15-mis/frb30-15-1.mis 420 100
+      - store_artifacts:
+          path: build/meson-logs
+
+  clang:
+    docker:
+      - image: ubuntu:latest
+    steps:
+      - run: apt update && apt install git clang-6.0 ninja-build meson -y
+      - checkout
+      - run: CXX=clang++-6.0 meson build --warnlevel 3 --werror
       - run: cd build && ninja
+      - run: cd build && ninja test
+      - run: cd build && ninja benchmark
       - store_artifacts:
           path: build/meson-logs
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build_gcc
       - coverage
-      - meson
+      - gcc
+      - clang
 
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,4 +1,3 @@
 ignore:
-  - "Lib.*/main.cpp$"
-  - "ParallelSolverAdapter/main.cpp$"
+  - "standalone/main.cpp$"
 
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/LibFastVC/CMakeLists.txt b/LibFastVC/CMakeLists.txt
diff --git a/LibFastVC/Makefile b/LibFastVC/Makefile
diff --git a/LibFastVC/main.cpp b/LibFastVC/main.cpp
diff --git a/LibFastVC/meson.build b/LibFastVC/meson.build
diff --git a/LibFastVC/fastvc.hpp → LibMVC/fastvc.hpp b/LibFastVC/fastvc.hpp → LibMVC/fastvc.hpp
diff --git a/LibNuMVC/internal/indexed_heap.hpp → LibMVC/internal/indexed_heap.hpp b/LibNuMVC/internal/indexed_heap.hpp → LibMVC/internal/indexed_heap.hpp
diff --git a/LibNuMVC/numvc.hpp → LibMVC/numvc.hpp b/LibNuMVC/numvc.hpp → LibMVC/numvc.hpp
diff --git a/...elSolverAdapter/ParallelSolverAdapter.hpp → LibMVC/parallelsolveradapter.hpp b/...elSolverAdapter/ParallelSolverAdapter.hpp → LibMVC/parallelsolveradapter.hpp
@@ -106,12 +106,16 @@ class ParallelSolverAdapter {
 
  private:
   static bool monitor(
-      const SOLVER &solver, bool better_cover_found, unsigned int tid,
+      const SOLVER & /* solver */,
+      bool better_cover_found,
+      unsigned int tid,
       ParallelSolverAdapter *self,
-      std::function<bool(const ParallelSolverAdapter &, bool)> printer) {
+      std::function<bool(const ParallelSolverAdapter &, bool)> printer)
+  {
     auto cover_size = self->solvers[tid]->get_best_cover_size();
     auto &state = self->global_state;
 
+
     // only lock if actual change present
     if (better_cover_found) {
       if (cover_size < state.best_cover) {
@@ -251,7 +255,7 @@ class ParallelSolverAdapter {
    */
   std::vector<int> get_independent_set(bool bias_by_one = true) const {
     auto best = global_state.best_solver;
-    return solvers[best]->get_independent_set();
+    return solvers[best]->get_independent_set(bias_by_one);
   }
 
   /**

diff --git a/LibNuMVC/CMakeLists.txt b/LibNuMVC/CMakeLists.txt
diff --git a/LibNuMVC/Makefile b/LibNuMVC/Makefile
diff --git a/LibNuMVC/meson.build b/LibNuMVC/meson.build
diff --git a/ParallelSolverAdapter/CMakeLists.txt b/ParallelSolverAdapter/CMakeLists.txt
diff --git a/ParallelSolverAdapter/Makefile b/ParallelSolverAdapter/Makefile