declare subsolutions interface

fplll · Aug 3, 2017 · 8dae6fa · 8dae6fa
1 parent 1f4ca8a
commit 8dae6fa
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/fpylll/fplll/fplll.pxd b/src/fpylll/fplll/fplll.pxd
@@ -506,14 +506,18 @@ cdef extern from "fplll/enum/evaluator.h" namespace "fplll":
         void eval_sol(const vector[FT]& newSolCoord,
                       const enumf& newPartialDist, enumf& maxDist, long normExp)
 
-        int size()
 
         int max_sols
         EvaluatorStrategy strategy
         multimap[FT, vector[FT]] solutions
+        size_t sol_count
+        vector[pair[FT, vector[FT]]] sub_solutions
+
         multimap[FP_NR[FT], vector[FP_NR[FT]]].reverse_iterator begin()
         multimap[FP_NR[FT], vector[FP_NR[FT]]].reverse_iterator end()
 
+        int size()
+        bool empty()
 
     cdef cppclass FastEvaluator[FT]:
         FastEvaluator()
@@ -522,22 +526,25 @@ cdef extern from "fplll/enum/evaluator.h" namespace "fplll":
         void eval_sol(const vector[FT]& newSolCoord,
                       const enumf& newPartialDist, enumf& maxDist, long normExp)
 
-        int size()
-
         int max_sols
         EvaluatorStrategy strategy
         multimap[FT, vector[FT]] solutions
+        size_t sol_count
+        vector[pair[FT, vector[FT]]] sub_solutions
+
         multimap[FP_NR[FT], vector[FP_NR[FT]]].reverse_iterator begin()
         multimap[FP_NR[FT], vector[FP_NR[FT]]].reverse_iterator end()
 
+        int size()
+        bool empty()
+
 
     cdef cppclass FastErrorBoundedEvaluator:
         FastErrorBoundedEvaluator()
         FastErrorBoundedEvaluator(int d, Matrix[FP_NR[mpfr_t]] mu, Matrix[FP_NR[mpfr_t]] r, EvaluatorMode eval_mode, size_t nr_solutions, EvaluatorStrategy strategy, bool find_subsolutions)
 
         void eval_sol(const vector[FP_NR[mpfr_t]]& newSolCoord,
                       const enumf& newPartialDist, enumf& maxDist, long normExp)
-
         int size()
 
         int max_sols
@@ -546,6 +553,7 @@ cdef extern from "fplll/enum/evaluator.h" namespace "fplll":
         multimap[FP_NR[mpfr_t], vector[FP_NR[mpfr_t]]].reverse_iterator begin()
         multimap[FP_NR[mpfr_t], vector[FP_NR[mpfr_t]]].reverse_iterator end()
 
+
 
 # Enumeration