Serialization Refactor

gap/OscarInterface/gap/OscarInterface.gd

@@ -26,5 +26,7 @@ DeclareProperty( "GroupGeneratorsDefinePresentation", IsGroup );
 
 # Use GAP operations for the serialization of GAP objects.
 # (The methods will be Julia functions.)
+DeclareOperation( "SerializationInOscarDependentObjects", [ IsObject ] );
 DeclareOperation( "SerializeInOscar", [ IsObject, IsObject ] );
 DeclareConstructor( "DeserializeInOscar", [ IsObject, IsObject, IsObject ] );
+DeclareConstructor( "DeserializeInOscar", [ IsObject, IsObject, IsObject, IsObject ] );

gap/OscarInterface/gap/OscarInterface.gi

@@ -127,6 +127,13 @@ InstallMethod( GroupGeneratorsDefinePresentation,
 ############################################################################
 
 
+Perform( Oscar._GAP_type_params,
+         function( entry )
+           InstallMethod( SerializationInOscarDependentObjects,
+             [ JuliaToGAP( IsString, entry[1] ) ],
+             Julia.GAP.WrapJuliaFunc( entry[2] ) );
+         end );
+
 Perform( Oscar._GAP_serializations,
          function( entry )
            InstallMethod( SerializeInOscar,
@@ -136,9 +143,15 @@ Perform( Oscar._GAP_serializations,
 
 Perform( Oscar._GAP_deserializations,
          function( entry )
-           InstallMethod( DeserializeInOscar,
-             [ JuliaToGAP( IsString, entry[1] ), "IsObject", "IsObject" ],
-             Julia.GAP.WrapJuliaFunc( entry[2] ) );
+           if entry[3] then
+             InstallMethod( DeserializeInOscar,
+               [ JuliaToGAP( IsString, entry[1] ), "IsObject", "IsObject", "IsObject" ],
+               Julia.GAP.WrapJuliaFunc( entry[2] ) );
+           else
+             InstallMethod( DeserializeInOscar,
+               [ JuliaToGAP( IsString, entry[1] ), "IsObject", "IsObject" ],
+               Julia.GAP.WrapJuliaFunc( entry[2] ) );
+           fi;
          end );
 
 ############################################################################

src/Combinatorics/SimplicialComplexes.jl

@@ -637,7 +637,7 @@ function deletion(K::SimplicialComplex, face::Union{<:AbstractSet{Int},<:Abstrac
 end
 
 @doc raw"""
-    automorphism_group(K::SimplicialComplex; action=:on_vertices)
+    automorphism_group(K::SimplicialComplex)
 
 Given a simplicial complex `K` return its automorphism group as a `PermGroup`.
 The group can be returned as a subgroup of the permutation group of the vertices
@@ -670,7 +670,7 @@ function automorphism_group(K::SimplicialComplex; action=:on_vertices)
 end
 
 @doc raw"""
-    on_simplicial_complex(K::SimplicialComplex, g::PermGroupElem)
+    on_simplicial_complex(K::SimplicialComplex, g::PermGroupElem;)
 
 Given a simplicial complex `K` return the simplicial complex corresponding
 to a permutation on it's vertices given by `g`.

src/Serialization/Algebras.jl

@@ -4,23 +4,23 @@
 # Free associative algebra serialization
 @register_serialization_type FreeAssociativeAlgebra uses_id
 
+type_params(R::T) where T <: FreeAssociativeAlgebra = T, base_ring(R)
+
 function save_object(s::SerializerState, A::FreeAssociativeAlgebra)
   save_data_dict(s) do
-    save_typed_object(s, base_ring(A), :base_ring),
     save_object(s, symbols(A), :symbols)
   end
 end
 
-function load_object(s::DeserializerState, ::Type{<:FreeAssociativeAlgebra})
-  R = load_typed_object(s, :base_ring)
+function load_object(s::DeserializerState, ::Type{<:FreeAssociativeAlgebra}, R::Ring)
   gens = load_object(s, Vector{Symbol}, :symbols)
   return free_associative_algebra(R, gens)[1]
 end
 
 # Free associative algebra element serialization
 @register_serialization_type FreeAssociativeAlgebraElem uses_params
 
-# see save_type_params in Rings
+# see type_params in Rings
 
 function save_object(s::SerializerState, f::FreeAssociativeAlgebraElem)
   save_data_array(s) do
@@ -33,8 +33,8 @@ function save_object(s::SerializerState, f::FreeAssociativeAlgebraElem)
   end
 end
 
-function load_object(s::DeserializerState, ::Type{<:FreeAssociativeAlgebraElem}, parents::Vector)
-  parent_algebra = parents[end]
+function load_object(s::DeserializerState, ::Type{<:FreeAssociativeAlgebraElem},
+                     parent_algebra::FreeAssociativeAlgebra)
   coeff_type = elem_type(base_ring(parent_algebra))
   elem = MPolyBuildCtx(parent_algebra)