Introduce seperated loading

peal · Aug 26, 2024 · 22e177b · 22e177b
1 parent ec0ffd3
commit 22e177b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 32 deletions.
diff --git a/init.g b/init.g
@@ -4,15 +4,26 @@
 # Reading the declaration part of the package.
 #
 
-ReadPackage( "BacktrackKit", "gap/tracer.gd");
-ReadPackage( "BacktrackKit", "gap/partitionstack.gd");
+# Private members
+if not IsBound(_BTKit) then
+    _BTKit := AtomicRecord(rec());
+fi;
+
+if not IsBound(_BTKit.FilesInit) then
+    ReadPackage( "BacktrackKit", "gap/tracer.gd");
+    ReadPackage( "BacktrackKit", "gap/partitionstack.gd");
+fi;
 
-if not IsBound(_BT_SKIP_INTERFACE) then
+if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.InitInterface) then
+    _BTKit.InitInterface := true;
     ReadPackage( "BacktrackKit", "gap/interface.gd");
 fi;
 
-ReadPackage( "BacktrackKit", "gap/BacktrackKit.gd");
+if not IsBound(_BTKit.FilesInit) then
+    _BTKit.FilesInit := true;
+    ReadPackage( "BacktrackKit", "gap/BacktrackKit.gd");
 
-ReadPackage( "BacktrackKit", "gap/canonical.gd");
-ReadPackage( "BacktrackKit", "gap/constraint.gd");
-ReadPackage( "BacktrackKit", "gap/refiner.gd");
+    ReadPackage( "BacktrackKit", "gap/canonical.gd");
+    ReadPackage( "BacktrackKit", "gap/constraint.gd");
+    ReadPackage( "BacktrackKit", "gap/refiner.gd");
+fi;
diff --git a/read.g b/read.g
@@ -5,36 +5,41 @@
 #
 
 # A store of the BTKit refiners
-BTKit_Refiner := AtomicRecord(rec());
-# For backwards compatibility
-BTKit_Con := BTKit_Refiner;
-BTKit_Ref := BTKit_Refiner;
+if not IsBound(BTKit_Refiner) then
+    BTKit_Refiner := AtomicRecord(rec());
+fi;
 
-# Private members
-_BTKit := AtomicRecord(rec());
 
-ReadPackage( "BacktrackKit", "gap/internal/util.g");
 
-ReadPackage( "BacktrackKit", "gap/stabtree.g");
+if not IsBound(_BTKit.ReadFiles) then
+    ReadPackage( "BacktrackKit", "gap/internal/util.g");
+    ReadPackage( "BacktrackKit", "gap/stabtree.g");
+    ReadPackage( "BacktrackKit", "gap/BacktrackKit.gi");
+fi;
 
-ReadPackage( "BacktrackKit", "gap/BacktrackKit.gi");
 
-if not IsBound(_BT_SKIP_INTERFACE) then
+if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.ReadInterface) then
+    _BTKit.ReadInterface := true;
     ReadPackage( "BacktrackKit", "gap/interface.gi");
 fi;
 
-ReadPackage( "BacktrackKit", "gap/canonical.gi");
-ReadPackage( "BacktrackKit", "gap/constraint.gi");
-ReadPackage( "BacktrackKit", "gap/partitionstack.gi");
-ReadPackage( "BacktrackKit", "gap/refiner.gi");
-ReadPackage( "BacktrackKit", "gap/tracer.gi");
-
-ReadPackage( "BacktrackKit", "gap/refiners/simple.g");
-ReadPackage( "BacktrackKit", "gap/refiners/conjugacyexample.g");
-ReadPackage( "BacktrackKit", "gap/refiners/normaliserexample.g");
-ReadPackage( "BacktrackKit", "gap/refiners/graphs.g");
-ReadPackage( "BacktrackKit", "gap/refiners/canonicalrefiners.g");
-ReadPackage( "BacktrackKit", "gap/refiners/tree/tree.g");
-
-Perform(["BTKit_Refiner", "_BTKit", "Constraint"],
-        SetNamesForFunctionsInRecord);
+if not IsBound(_BTKit.ReadFiles) then
+    _BTKit.ReadFiles := true;
+
+    ReadPackage( "BacktrackKit", "gap/canonical.gi");
+    ReadPackage( "BacktrackKit", "gap/constraint.gi");
+    ReadPackage( "BacktrackKit", "gap/partitionstack.gi");
+    ReadPackage( "BacktrackKit", "gap/refiner.gi");
+    ReadPackage( "BacktrackKit", "gap/tracer.gi");
+
+    ReadPackage( "BacktrackKit", "gap/refiners/simple.g");
+    ReadPackage( "BacktrackKit", "gap/refiners/conjugacyexample.g");
+    ReadPackage( "BacktrackKit", "gap/refiners/normaliserexample.g");
+    ReadPackage( "BacktrackKit", "gap/refiners/graphs.g");
+    ReadPackage( "BacktrackKit", "gap/refiners/canonicalrefiners.g");
+    ReadPackage( "BacktrackKit", "gap/refiners/tree/tree.g");
+
+    Perform(["BTKit_Refiner", "_BTKit", "Constraint"],
+            SetNamesForFunctionsInRecord);
+fi;
+