diff --git a/syngular/ideal.py b/syngular/ideal.py index 085fd17..f4a73d9 100644 --- a/syngular/ideal.py +++ b/syngular/ideal.py @@ -55,7 +55,7 @@ def squoosh(self): def dim(self): singular_commands = [f"ring r = {self.ring};", f"ideal i = {self};", # Check which is better - f"ideal gb = std(i);", # {','.join(self.groebner_basis)};", + "ideal gb = std(i);", # {','.join(self.groebner_basis)};", "print(dim(gb));", "$"] output = execute_singular_command(singular_commands) diff --git a/syngular/ideal_algorithms.py b/syngular/ideal_algorithms.py index 523063f..e52fa40 100644 --- a/syngular/ideal_algorithms.py +++ b/syngular/ideal_algorithms.py @@ -122,7 +122,7 @@ def extension_contraction(self, U, ordering="lp"): Ideal = self.__class__ return int(string.split("\n")[1]), Ideal(r, [entry.replace(",", "") for entry in string.split("\n")[3:]]) - def primeTestDLP(self, verbose=False, timeout_fpoly=10, timeout_dim=600, + def primeTestDLP(self, verbose=False, timeout_fpoly=10, timeout_dim=600, iterated_degbound_computation=False, projection_number=None): """Returns True if the ideal is prime, False if it is not. Raises Inconclusive if it can't decide. Assumes equidimensionality of input ideal. Experimental new feature with iterated_degbound_computation=True, may help when ideal is prime and deg-unbounded computation fails. diff --git a/syngular/ring.py b/syngular/ring.py index 0e03552..f315a9f 100644 --- a/syngular/ring.py +++ b/syngular/ring.py @@ -44,7 +44,7 @@ def ordering(self): @ordering.setter def ordering(self, ordering): if isinstance(ordering, str): - assert ordering in ['lp', 'rp', 'dp', 'Dp', 'ls', 'rs', 'ds', 'Ds'] + assert ordering[:2] in ['lp', 'rp', 'dp', 'Dp', 'ls', 'rs', 'ds', 'Ds', 'wp'] if ordering[1] == 's': print("Warning: chosen ordering is not a well-ordering.") else: