Automorphisms extended

Author: Winfried Bruns

NormalizModule.cpp

@@ -710,26 +710,55 @@ static PyObject*
 NmzAutomorphismsToPython(const AutomorphismGroup< Integer >& grp)
 {
 
-    PyObject* list = PyList_New(4);
+    PyObject* list = PyList_New(6);
 
     PyList_SetItem(list, 0, NmzToPyNumber(grp.getOrder()));
+    PyList_SetItem(list, 1, BoolToPyBool(grp.IsIntegralityChecked()));
+    PyList_SetItem(list, 2, BoolToPyBool(grp.IsIntegral())); 
+    
+    if(grp.IsInput() || grp.IsAmbient()){
+        PyObject* current = PyList_New(2);        
+        PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getGensPerms()));
+        PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getGensOrbits()));
+        PyList_SetItem(list, 3, current);
+        
+        current = PyList_New(2);
+        vector<vector<long> > Empty;
+        PyList_SetItem(current, 0, NmzMatrixToPyList(Empty));
+        PyList_SetItem(current, 1, NmzMatrixToPyList(Empty));
+        PyList_SetItem(list, 4, current);
+        
+        if(grp.IsAmbient()){
+            current = PyList_New(2);
+            PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getLinFormsPerms()));
+            PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getLinFormsOrbits()));
+            PyList_SetItem(list, 5, current);            
+        }
+        else{
+            vector<vector<long> > Empty;
+            PyList_SetItem(current, 0, NmzMatrixToPyList(Empty));
+            PyList_SetItem(current, 1, NmzMatrixToPyList(Empty));
+            PyList_SetItem(list, 5, current);            
+        }        
+    }    
+    else{
+        PyObject* current = PyList_New(2);
+        PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getExtremeRaysPerms()));
+        PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getExtremeRaysOrbits()));
+        PyList_SetItem(list, 3, current);
 
-    PyObject* current = PyList_New(2);
-    PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getExtremeRaysPerms()));
-    PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getExtremeRaysOrbits()));
-    PyList_SetItem(list, 1, current);
-
-    current = PyList_New(2);
-    PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getVerticesPerms()));
-    PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getVerticesOrbits()));
-    PyList_SetItem(list, 2, current);
+        current = PyList_New(2);
+        PyList_SetItem(current, 0, NmzMatrixToPyList(grp.getVerticesPerms()));
+        PyList_SetItem(current, 1, NmzMatrixToPyList(grp.getVerticesOrbits()));
+        PyList_SetItem(list, 4, current);
 
-    current = PyList_New(2);
-    PyList_SetItem(current, 0,
-                   NmzMatrixToPyList(grp.getSupportHyperplanesPerms()));
-    PyList_SetItem(current, 1,
-                   NmzMatrixToPyList(grp.getSupportHyperplanesOrbits()));
-    PyList_SetItem(list, 3, current);
+        current = PyList_New(2);
+        PyList_SetItem(current, 0,
+                    NmzMatrixToPyList(grp.getSupportHyperplanesPerms()));
+        PyList_SetItem(current, 1,
+                    NmzMatrixToPyList(grp.getSupportHyperplanesOrbits()));
+        PyList_SetItem(list, 5, current);    
+    }
 
     return list;
 }
@@ -1725,6 +1754,10 @@ _NmzResultImpl(Cone< Integer >* C, PyObject* prop_obj, void* nf = nullptr)
         case libnormaliz::ConeProperty::AmbientAutomorphisms:
             return NmzAutomorphismsToPython(C->getAutomorphismGroup(
                 libnormaliz::ConeProperty::AmbientAutomorphisms));
+            
+        case libnormaliz::ConeProperty::InputAutomorphisms:
+            return NmzAutomorphismsToPython(C->getAutomorphismGroup(
+                libnormaliz::ConeProperty::InputAutomorphisms));
 
         case libnormaliz::ConeProperty::CombinatorialAutomorphisms:
             return NmzAutomorphismsToPython(C->getAutomorphismGroup(

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = PyNormaliz
-version = 2.14
+version = 2.15
 description = An interface to Normaliz
 author = Sebastian Gutsche, Richard Sieg
 author_email = [email protected]

tests/autom.txt

@@ -4,6 +4,6 @@ Test automorphism group
 >>> from PyNormaliz import Cone, NmzCone, NmzResult
 >>> V = [[-1, -1, 1], [-1, 0, 1], [-1, 1, 1], [0, -1, 1], [0, 0, 1], [0, 1, 1], [1, -1, 1], [1, 0, 1], [1, 1, 1]]
 >>> cube2 = NmzCone(vertices=V)
->>> NmzResult(cube2,"Automorphisms") == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+>>> NmzResult(cube2,"Automorphisms") == [8, True, True, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
 True
 

tests/generic_test.py

@@ -192,7 +192,7 @@ class Test2(GenericPyNormalizTest):
 
     # expected results
     AffineDim = 2
-    Automorphisms = [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+    Automorphisms = [8, True, True, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
     Congruences = []
     Dehomogenization = normaliz_error
     EmbeddingDim = 5

tests/test_rational_cones.txt

@@ -67,17 +67,15 @@ True
 True
 >>> len(NmzResult(cube2, "FaceLattice")) == 10
 True
->>> cube1.Automorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+>>> cube1.Automorphisms() == [8, True, True, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]] 
 True
->>> cube1.Automorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]] 
+>>> cube1.CombinatorialAutomorphisms() == [8,  False, False, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
 True
->>> cube1.CombinatorialAutomorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+>>> cube1.RationalAutomorphisms() == [8, True, True, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
 True
->>> cube1.RationalAutomorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+>>> cube1.RationalAutomorphisms() == [8,  True, True, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
 True
->>> cube1.RationalAutomorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
-True
->>> cube1.EuclideanAutomorphisms() == [8, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
+>>> cube1.EuclideanAutomorphisms() == [8, False, False, [[], []], [[[0, 2, 1, 3], [1, 0, 3, 2]], [[0, 1, 2, 3]]], [[[1, 0, 3, 2], [0, 2, 1, 3]], [[0, 1, 2, 3]]]]
 True
 >>> cube1.Incidence() == [[0, 0, 1, 1], [0, 1, 0, 1], [1, 0, 1, 0], [1, 1, 0, 0]]
 True