Update for bmat8-hpp changes

james-d-mitchell · Apr 26, 2024 · a9aabb3 · a9aabb3
1 parent 7bcdefb
commit a9aabb3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/bipart.cpp b/src/bipart.cpp
@@ -34,10 +34,10 @@
 #include "compiled.h"
 
 // libsemigroups headers
-#include "libsemigroups/bipart.hpp"  // for Blocks, Bipartition, validate
+#include "libsemigroups/bipart.hpp"         // for Blocks, Bipartition, validate
 #include "libsemigroups/detail/report.hpp"  // for Reporter, etc
 #include "libsemigroups/detail/timer.hpp"   // for Timer
-#include "semigroups-config.hpp"     // for SEMIGROUPS_KERNEL_DEBUG
+#include "semigroups-config.hpp"            // for SEMIGROUPS_KERNEL_DEBUG
 
 #include "gapbind14/gapbind14.hpp"  // for GAPBIND14_TRY
 
@@ -1400,8 +1400,8 @@ class IdempotentCounter {
   std::vector<size_t> count() {
     libsemigroups::detail::reset_thread_ids();
     libsemigroups::report_default("using {} / {} additional threads",
-                   _nr_threads,
-                   std::thread::hardware_concurrency());
+                                  _nr_threads,
+                                  std::thread::hardware_concurrency());
     Timer timer;
 
     for (size_t i = 0; i < _nr_threads; i++) {
@@ -1413,7 +1413,7 @@ class IdempotentCounter {
       _threads[i].join();
     }
 
-        libsemigroups::report_elapsed_time("", timer);
+    libsemigroups::report_elapsed_time("", timer);
 
     size_t              max = *max_element(_ranks.begin(), _ranks.end()) + 1;
     std::vector<size_t> out = std::vector<size_t>(max, 0);
@@ -1449,7 +1449,7 @@ class IdempotentCounter {
         }
       }
     }
-        libsemigroups::report_default("finished in {}", timer);
+    libsemigroups::report_default("finished in {}", timer);
   }
 
   // This is basically the same as BLOCKS_E_TESTER, but is required because we

diff --git a/src/conglatt.cpp b/src/conglatt.cpp
@@ -41,10 +41,10 @@
 #include "semigroups-debug.hpp"  // for SEMIGROUPS_ASSERT
 
 // libsemigroups headers
-#include "libsemigroups/adapters.hpp"  // for Hash
-#include "libsemigroups/detail/report.hpp"    // for should_report
-#include "libsemigroups/detail/string.hpp"    // for group_digits
-                                       //
+#include "libsemigroups/adapters.hpp"       // for Hash
+#include "libsemigroups/detail/report.hpp"  // for should_report
+#include "libsemigroups/detail/string.hpp"  // for group_digits
+                                            //
 
 namespace semigroups {
   namespace {

diff --git a/src/pkg.cpp b/src/pkg.cpp
@@ -407,8 +407,10 @@ static StructGVarFilt GVarFilts[] = {
 
 typedef Obj (*GVarFunc)(/*arguments*/);
 
-#define GVAR_ENTRY(srcfile, name, nparam, params) \
-  { #name, nparam, params, (GVarFunc) name, srcfile ":Func" #name }
+#define GVAR_ENTRY(srcfile, name, nparam, params)                 \
+  {                                                               \
+#name, nparam, params, (GVarFunc) name, srcfile ":Func" #name \
+  }
 
 // Table of functions to export
 

diff --git a/src/to_cpp.hpp b/src/to_cpp.hpp
@@ -200,7 +200,7 @@ namespace gapbind14 {
         }
         for (size_t j = 0; j < m; j++) {
           if (ELM_BLIST(row, j + 1) == True) {
-            x.set(i, j, 1);
+            x(i, j) = 1;
           }
         }
       }

diff --git a/src/to_gap.hpp b/src/to_gap.hpp
@@ -169,7 +169,7 @@ namespace gapbind14 {
         Obj blist = NewBag(T_BLIST, SIZE_PLEN_BLIST(n));
         SET_LEN_BLIST(blist, n);
         for (size_t j = 0; j < n; j++) {
-          if (x.first.get(i, j)) {
+          if (x.first(i, j)) {
             SET_BIT_BLIST(blist, j + 1);
           }
         }