commit 9c36f0b897774a4288a814be9e801acef1beb9cc
parent 6cba5c0e44be17c653cb2c41d847e18695f34dad
Author: olikru <olikru@tkruger.se>
Date: Tue, 16 Jan 2024 11:30:46 +0100
playing around
Diffstat:
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/cyclefind.c b/cyclefind.c
@@ -1,7 +1,7 @@
#include "cyclefind.h"
uint64_t cyclefind_floyd(uint64_t *mu, uint64_t x0,
- uint64_t (*f)(uint64_t)) {
+ uint64_t (*f)(uint64_t)) {
uint64_t t = f(x0);
uint64_t h = f(t);
uint64_t lam = 1;
@@ -29,7 +29,7 @@ uint64_t cyclefind_floyd(uint64_t *mu, uint64_t x0,
}
uint64_t cyclefind_brent(uint64_t *mu, uint64_t x0,
- uint64_t (*f)(uint64_t)) {
+ uint64_t (*f)(uint64_t)) {
size_t i;
uint64_t power = 1;
uint64_t lam = 1;
@@ -50,7 +50,7 @@ uint64_t cyclefind_brent(uint64_t *mu, uint64_t x0,
h = x0;
t = h;
- for(i = 0; i < lam; i++) {
+ for (i = 0; i < lam; i++) {
h = f(h);
}
diff --git a/cyclefind.h b/cyclefind.h
@@ -20,7 +20,7 @@
* @returns the value of lambda, as defined above
*/
uint64_t cyclefind_floyd(uint64_t *mu, uint64_t x0,
- uint64_t(*f)(uint64_t));
+ uint64_t (*f)(uint64_t));
/**
* Cycle finding (Brent's algorithm)
@@ -39,6 +39,6 @@ uint64_t cyclefind_floyd(uint64_t *mu, uint64_t x0,
* @returns the value of lambda, as defined above
*/
uint64_t cyclefind_brent(uint64_t *mu, uint64_t x0,
- uint64_t (*f)(uint64_t));
+ uint64_t (*f)(uint64_t));
#endif
diff --git a/smallfactor.c b/smallfactor.c
@@ -2,10 +2,11 @@
#define N_EIGHT_BIT_PRIMES 54
const uint64_t EIGHT_BIT_PRIMES[N_EIGHT_BIT_PRIMES] = {
- 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43,
- 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107,
- 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181,
- 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251};
+ 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31,
+ 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79,
+ 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137,
+ 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193,
+ 197, 199, 211, 223, 227, 229, 233, 239, 241, 251};
size_t smallfactor_euclidean(fmpz_t out, fmpz_t n) {
size_t i;
diff --git a/test_angrepp.c b/test_angrepp.c
@@ -4,9 +4,7 @@
#include "cyclefind.h"
-static uint64_t test_f(uint64_t x) {
- return (3 * x + 7) % 18;
-}
+static uint64_t test_f(uint64_t x) { return (3 * x + 7) % 18; }
static void test_cyclefind_floyd() {
uint64_t lambda, mu;
@@ -24,7 +22,6 @@ static void test_cyclefind_brent() {
assert(mu == 1);
}
-
int main() {
test_cyclefind_floyd();
test_cyclefind_brent();