Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new operation info at more places #1698

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Use new operation info at more places #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CAP/PackageInfo.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SetPackageInfo( rec(

PackageName := "CAP",
Subtitle := "Categories, Algorithms, Programming",
Version := "2024.10-02",
Version := "2024.10-03",
Date := (function ( ) if IsBound( GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE ) then return GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE; else return Concatenation( ~.Version{[ 1 .. 4 ]}, "-", ~.Version{[ 6, 7 ]}, "-01" ); fi; end)( ),
License := "GPL-2.0-or-later",

Expand Down
4 changes: 2 additions & 2 deletions CAP/gap/Derivations.gi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,15 +1144,15 @@

od;

Assert( 0, IsIdenticalObj( Last( category!.added_functions.( name ) ), DerivationFunction( current_derivation ) ) );
Assert( 0, IsIdenticalObj( category!.operations.( name ).func, DerivationFunction( current_derivation ) ) );

Check warning on line 1147 in CAP/gap/Derivations.gi

View check run for this annotation

Codecov / codecov/patch

CAP/gap/Derivations.gi#L1147 

Added line #L1147 was not covered by tests

else

Error( "this should never happen" );

fi;

currently_installed_func := Last( category!.added_functions.( name ) );
currently_installed_func := category!.operations.( name ).func;

Check warning on line 1155 in CAP/gap/Derivations.gi

View check run for this annotation

Codecov / codecov/patch

CAP/gap/Derivations.gi#L1155 

Added line #L1155 was not covered by tests

Print( "\nThe following function was installed for this operation:\n\n" );
Display( currently_installed_func );
Expand Down
2 changes: 1 addition & 1 deletion CompilerForCAP/PackageInfo.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SetPackageInfo( rec(

PackageName := "CompilerForCAP",
Subtitle := "Speed up and verify categorical algorithms",
Version := "2024.10-02",
Version := "2024.10-03",
Date := (function ( ) if IsBound( GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE ) then return GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE; else return Concatenation( ~.Version{[ 1 .. 4 ]}, "-", ~.Version{[ 6, 7 ]}, "-01" ); fi; end)( ),
License := "GPL-2.0-or-later",

Expand Down
4 changes: 2 additions & 2 deletions CompilerForCAP/examples/LinearAlgebraForCAP.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ morphism_matrix := [ [ alpha, beta ], [ beta, alpha ] ];;

# compile the derivation of MorphismBetweenDirectSumsWithGivenDirectSums
Print(
vec!.added_functions.MorphismBetweenDirectSumsWithGivenDirectSums[1],
vec!.operations.MorphismBetweenDirectSumsWithGivenDirectSums.func,
"\n"
);
#! function ( cat, S, diagram_S, morphism_matrix, diagram_T, T )
Expand All @@ -35,7 +35,7 @@ Print(
#! T, test_diagram_coproduct, S );
#! end
compiled_func2 := CapJitCompiledFunction(
vec!.added_functions.MorphismBetweenDirectSumsWithGivenDirectSums[1],
vec!.operations.MorphismBetweenDirectSumsWithGivenDirectSums.func,
vec
);;
Display( compiled_func2 );
Expand Down
2 changes: 1 addition & 1 deletion CompilerForCAP/gap/CompileCAPOperation.gi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ InstallGlobalFunction( "CapJitCompiledCAPOperationAsEnhancedSyntaxTree", functio

if not IsBound( cat!.compiled_functions_trees.(operation_name) ) then

function_to_compile := Last( cat!.added_functions.(operation_name) );
function_to_compile := cat!.operations.(operation_name).func;

if IsOperation( function_to_compile ) or IsKernelFunction( function_to_compile ) then

Expand Down
Loading