Merge branch 'stable-3.0'

semigroups · Dec 7, 2017 · a93cd9d · a93cd9d
2 parents dbdc3e0 + a4ebab2
commit a93cd9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ compiler:
 env:
   global:
     - COVDIR=coverage
-    - LIBSEMI=v0.5.2
+    - LIBSEMI=v0.6.0
     - g++=g++-5
     - gcc=gcc-5
 

diff --git a/src/bipart.cc b/src/bipart.cc
@@ -1376,7 +1376,6 @@ class IdempotentCounter {
                     << std::thread::hardware_concurrency()
                     << " threads");
     Timer timer;
-    timer.start();
 
     for (size_t i = 0; i < _nr_threads; i++) {
       _threads.push_back(
@@ -1387,7 +1386,7 @@ class IdempotentCounter {
       _threads[i].join();
     }
 
-    REPORT(timer.string("elapsed time = "));
+    REPORT(timer);
 
     size_t              max = *max_element(_ranks.begin(), _ranks.end()) + 1;
     std::vector<size_t> out = std::vector<size_t>(max, 0);
@@ -1410,7 +1409,6 @@ class IdempotentCounter {
  private:
   void thread_counter(size_t thread_id) {
     Timer timer;
-    timer.start();
 
     for (unpr_t index : _unprocessed[thread_id]) {
       if (tester(thread_id, index.first, index.first)) {

diff --git a/src/fropin.cc b/src/fropin.cc
@@ -21,9 +21,9 @@
 #include <algorithm>
 #include <iostream>
 
-#include "semigroups-debug.h"
 #include "libsemigroups/src/report.h"
 #include "rnams.h"
+#include "semigroups-debug.h"
 #include "semigrp.h"
 
 using libsemigroups::Timer;
@@ -117,7 +117,6 @@ Obj fropin(Obj obj, Obj limit, Obj lookfunc, Obj looking) {
   REPORT_FROM_FUNC("limit = " << int_limit);
 
   Timer timer;
-  timer.start();
 
   // get everything out of <data>
 
@@ -321,7 +320,7 @@ Obj fropin(Obj obj, Obj limit, Obj lookfunc, Obj looking) {
                                 << " rules, max word length "
                                 << len + 1
                                 << ", finished!");
-      REPORT_FROM_FUNC(timer.string("elapsed time = "));  // NOLINT()
+      REPORT_FROM_FUNC("elapsed time = " << timer);  // NOLINT()
     }
   }