Skip to content

Commit

Permalink
Fix checking package in read.g/init.g
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisJefferson committed Aug 27, 2024
1 parent a6871f8 commit 7915ad2
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions gap/GraphBacktracking.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
#! Information about backtrack search
InfoGB := InfoBTKit;

# From init.g
_BTKit.FilesInitGB := true;
2 changes: 2 additions & 0 deletions gap/GraphBacktracking.gi
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,5 @@ _GB.BuildProblem :=
{ps, conlist, conf} -> Objectify(GBStateType, rec(ps := ps, conlist := conlist, graphs := [], raw_graphs := [],
config := _BTKit.FillConfig(conf, _GB.DefaultConfig)));

# For read.g
_BTKit.FilesReadGB := true;
3 changes: 3 additions & 0 deletions gap/interface.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ DeclareGlobalFunction( "GB_SimpleAllPermSearch" );

DeclareGlobalFunction( "GB_CheckInitialGroup" );
DeclareGlobalFunction( "GB_CheckInitialCoset" );

# From init.g
_BTKit.InitInterfaceGB := true;
3 changes: 3 additions & 0 deletions gap/interface.gi
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ InstallGlobalFunction( GB_CheckInitialCoset,
autgraph2 := [OnDigraphs(sols2.graph[1], sols2.canonicalperm), List(sols2.graph[2], x -> OnSets(x, sols2.canonicalperm))];
return rec(graph1 := autgraph1, graph2 := autgraph2, equal := autgraph1 = autgraph2);
end);

# For read.g
_BTKit.ReadInterfaceGB := true;
4 changes: 2 additions & 2 deletions init.g
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@


if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.InitInterfaceGB) then
_BTKit.InitInterfaceGB := true;
# _BTKit.InitInterfaceGB := true; in gap/interface.gd
ReadPackage( "GraphBacktracking", "gap/interface.gd");
fi;

if not IsBound(_BTKit.FilesInitGB) then
_BTKit.FilesInitGB := true;
# _BTKit.FilesInitGB := true; in gap/GraphBacktracking.gd
ReadPackage( "GraphBacktracking", "gap/GraphBacktracking.gd");
ReadPackage( "GraphBacktracking", "gap/Equitable.gd");
fi;
4 changes: 2 additions & 2 deletions read.g
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ if not IsBound(_BTKit.FilesReadGB) then
fi;

if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.ReadInterfaceGB) then
_BTKit.ReadInterfaceGB := true;
# _BTKit.ReadInterfaceGB := true; in gap/interface.gi
ReadPackage( "GraphBacktracking", "gap/interface.gi");
fi;

if not IsBound(_BTKit.FilesReadGB) then
_BTKit.FilesReadGB := true;
# _BTKit.FilesReadGB := true; in gap/GraphBacktracking.gi
ReadPackage( "GraphBacktracking", "gap/GraphBacktracking.gi");
ReadPackage( "GraphBacktracking", "gap/Equitable.gi");
ReadPackage( "GraphBacktracking", "gap/constraints/simpleconstraints.g");
Expand Down

0 comments on commit 7915ad2

Please sign in to comment.