summaryrefslogtreecommitdiff
blob: dad1dc7db8f3a416b75b9e6d434fcf76e5d4790d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
--- msieve-1.50/common/minimize.c	2011-07-04 23:32:33.000000000 +0800
+++ msieve-copy/common/minimize.c	2012-11-26 23:09:22.889240528 +0800
@@ -210,7 +210,7 @@
 		}
 	}
 
-	printf("too many line iterations\n");
+	//printf("too many line iterations\n");
 	*min_out = x;
 	*status = 1;
 	return fx;
diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c
--- msieve-1.50/gnfs/poly/stage2/optimize.c	2011-10-15 23:03:39.000000000 +0800
+++ msieve-copy/gnfs/poly/stage2/optimize.c	2012-11-26 23:14:36.243232414 +0800
@@ -390,7 +390,7 @@
 			score = minimize(best, num_vars, tol, 40, 
 					objective, &opt_data);
 
-			printf("i %u score %le\n", i, score);
+			//printf("i %u score %le\n", i, score);
 			for (j = 0; j <= rotate_dim; j++) {
 				double cj = floor(best[ROTATE0 + j] + 0.5);
 				mpz_set_d(c->gmp_help1, cj);
@@ -422,7 +422,7 @@
 			tol = 1e-5;
 			score = ifs_rectangular(apoly.coeff, apoly.degree,
 						best[SKEWNESS]);
-			printf("transition score %le\n", score);
+			//printf("transition score %le\n", score);
 		}
 	}
 
@@ -430,9 +430,9 @@
 #if 0
 	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
 	for (i = 0; i < 2; i++)
-		gmp_printf("%+Zd\n", c->gmp_lina[i]);
+		//gmp_printf("%+Zd\n", c->gmp_lina[i]);
 	for (i = 0; i <= deg; i++)
-		gmp_printf("%+Zd\n", c->gmp_a[i]);
+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
 #endif
 }
 
diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c
--- msieve-1.50/gnfs/poly/stage2/stage2.c	2011-10-09 09:32:49.000000000 +0800
+++ msieve-copy/gnfs/poly/stage2/stage2.c	2012-11-26 23:14:30.894232552 +0800
@@ -122,10 +122,10 @@
 	}
 
 #if 0
-	gmp_printf("%+Zd\n", c->gmp_lina[0]);
-	gmp_printf("%+Zd\n", c->gmp_lina[1]);
+	//gmp_printf("%+Zd\n", c->gmp_lina[0]);
+	//gmp_printf("%+Zd\n", c->gmp_lina[1]);
 	for (i = 0; i <= degree; i++)
-		gmp_printf("%+Zd\n", c->gmp_a[i]);
+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
 
 	printf("coeff ratio = %.5lf\n",
 		fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound);