Skip to content

Commit

Permalink
fixing conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cdwensley committed May 17, 2024
2 parents 3733e50 + 602008d commit d2189c9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@ jobs:
matrix:
gap-branch:
- master
- stable-4.13
- stable-4.12
- stable-4.11

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gap-actions/setup-gap@v2
with:
GAP_PKGS_TO_BUILD: "io nq profiling"
GAPBRANCH: ${{ matrix.gap-branch }}
- uses: gap-actions/build-pkg@v1
- uses: gap-actions/run-pkg-tests@v2
- uses: gap-actions/run-pkg-tests@v2
with:
only-needed: true
- uses: gap-actions/process-coverage@v2
- uses: codecov/codecov-action@v3

Expand All @@ -44,15 +49,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gap-actions/setup-gap@v2
with:
GAP_PKGS_TO_BUILD: "io nq profiling"
- uses: gap-actions/build-pkg-docs@v1
with:
use-latex: 'true'
- name: 'Upload documentation'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: manual
path: ./doc/manual.pdf
if-no-files-found: error
14 changes: 7 additions & 7 deletions lib/algebra.gi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##
#W algebra.gi The XMODALG package Zekeriya Arvasi
#W & Alper Odabas
#Y Copyright (C) 2014-2022, Zekeriya Arvasi & Alper Odabas,
#Y Copyright (C) 2014-2024, Zekeriya Arvasi & Alper Odabas,
##

############################ algebra operations ###########################
Expand Down Expand Up @@ -134,7 +134,7 @@ InstallMethod( MultiplierAlgebraByGenerators,
[ IsAlgebra, IsList ], 0,
function ( A, L )
local I, ok, domA, M;
ok := ForAll( L, m -> IsAlgebraMultiplier( m ) );
ok := ForAll( L, IsAlgebraMultiplier );
if not ok then
Info( InfoXModAlg, 1, "L is not a list of multipliers" );
return fail;
Expand Down Expand Up @@ -164,7 +164,7 @@ function( G, H )
if ( "IsGroupAlgebra" in KnownPropertiesOfObject(G) ) then
H_G := UnderlyingGroup(G);
L := MinimalGeneratingSet(H_G);
genG := List( L , g -> g^Embedding(H_G,G) );
genG := List( L, g -> g^Embedding(H_G,G) );
else
genG := GeneratorsOfAlgebra(G);
fi;
Expand Down Expand Up @@ -244,7 +244,7 @@ function( G, H )
if ( "IsGroupAlgebra" in KnownPropertiesOfObject(G) ) then
H_G := UnderlyingGroup(G);
L := MinimalGeneratingSet(H_G);
genG := List( L , g -> g^Embedding(H_G,G) );
genG := List( L, g -> g^Embedding(H_G,G) );
else
genG := GeneratorsOfAlgebra(G);
fi;
Expand Down Expand Up @@ -325,7 +325,7 @@ local A,B,a,b,h,f,i,sonuc,mler,j,k,eH,l,L,g,H_G,genG;
eH := Elements(H);
H_G := UnderlyingGroup(G);
L := MinimalGeneratingSet(H_G);
genG := List( L , g -> g^Embedding(H_G,G) );
genG := List( L, g -> g^Embedding(H_G,G) );
if ( Length(genG) = 0 ) then
genG := GeneratorsOfAlgebra(G);
fi;
Expand Down Expand Up @@ -451,7 +451,7 @@ function( hom, U )
fi;

gens:=GeneratorsOfAlgebra(U);
imgs:=List(gens,i->ImageElm(hom,i));
imgs:=List( gens, i->ImageElm(hom,i) );

if HasImagesSource(hom) then
imgp:=ImagesSource(hom);
Expand Down Expand Up @@ -578,7 +578,7 @@ function( arg )

nargs := Length( arg );
# Algebra, Ideal, and Subalgebra
if ( ( nargs = 3 ) and ForAll( arg, a -> IsAlgebra(a) ) ) then
if ( ( nargs = 3 ) and ForAll( arg, IsAlgebra ) ) then
return AlgebraActionByMultipliers( arg[1], arg[2], arg[3] );
# Multiplier Action
elif ( ( nargs = 1 ) and IsAlgebra( arg[1] ) ) then
Expand Down

0 comments on commit d2189c9

Please sign in to comment.