Split some stuff into utils.gp

1 files changed, 5 insertions, 29 deletions

diff --git a/points.gp b/points.gp
index 647e565..428704e 100644
--- a/points.gp
+++ b/points.gp
@@ -1,4 +1,5 @@
-/* Finds random point of order n on curve e of order o.
+/**
+ * Finds random point of order n on curve e of order o.
  * @returns [[P.x, P.y], n, h]
  * @param e curve
  * @param o curve order
@@ -13,7 +14,8 @@ find_point(e, o, n) = {
 	return([P, n, h]);
 }
 
-/* Finds random points of orders given by vector p.
+/**
+ * Finds random points of orders given by vector p.
  * @returns vector of points in format [[P.x, P.y], n, h]
  * @param e curve
  * @param o curve order
@@ -41,40 +43,14 @@ minprime_order(e, o) = {
 	);
 }
 
-max_order(e, o) = {
-	return(o);
-}
-
-/* Finds a random point of order given by f(o).
- * @returns [[P.x, P.y], n, h]
- * with P being the point with order f(o).
- * @param e curve
- * @param o curve order
- * @param f function returning the point order, \in maxprime_order,
- *			minprime_order, max_order
- */
-get_point(e, o, f) = {
-	return(find_point(e, o, f(o)));
-}
-
 /*####################################################################*/
 
 prime_orders(e, o) = {
 	local(f);
 	if(isprime(o),
-		return([o]);;
+		return([o]);
 	,
 		f = factor(o);
 		return(vector(length(f),X,f[X,1]));
 	);
 }
-
-/* Finds random points of orders given by f(o).
- * @returns vector of points in format [[P.x, P.y], n, h]
- * @param e curve
- * @param o curve order
- * @param f function returning a vector of point orders
- */
-get_points(e, o, f) = {
-	return(find_points(e, o, f(o)));
-}