Corrections to factor experiment.

diff --git a/factors.sh b/factors.sh
index d45266f..d5f10ac 100644 (file)
--- a/factors.sh
+++ b/factors.sh
@@ -4,13 +4,14 @@
 # each iteration and we already have 20 from the test run. Maximale
 # sample number is 300.
 
 # each iteration and we already have 20 from the test run. Maximale
 # sample number is 300.
 

-for N in `seq 10 10 300`
+for N in `seq 40 10 300`

 do
     # Run experiment
     echo > DATA.degrees.$N
     for I in `seq 5 5 80`
     do
        ./test.native --factors --size $I --times 10 \
 do
     # Run experiment
     echo > DATA.degrees.$N
     for I in `seq 5 5 80`
     do
        ./test.native --factors --size $I --times 10 \

+                     | maple -q \

                      >> DATA.factors.$N
     done
 
                      >> DATA.factors.$N
     done
 


@@ -18,7 +19,7 @@ do
     echo 'let data = [' \
         > dataFACTORS.ml
 
     echo 'let data = [' \
         > dataFACTORS.ml
 

-    cat DATA.* \
+    cat DATA.factors.* \

        | sed 's/[a-z =]//g' \
        | cut -d, -f1,3,5 \
        | sed 's/\.$/;/' \
        | sed 's/[a-z =]//g' \
        | cut -d, -f1,3,5 \
        | sed 's/\.$/;/' \

diff --git a/makeHTMLfactors.ml b/makeHTMLfactors.ml
index 41b03f8..ae37cd5 100644 (file)
--- a/makeHTMLfactors.ml
+++ b/makeHTMLfactors.ml
@@ -27,7 +27,7 @@ let main samples total predict =
   let coords = map_coords ~width:90. ~height:120. in
   head "Common Factor Degrees" "Common Factor Degrees over GF(2)[<i>x</i>]";
   defs total predict;
   let coords = map_coords ~width:90. ~height:120. in
   head "Common Factor Degrees" "Common Factor Degrees over GF(2)[<i>x</i>]";
   defs total predict;

-  axes "<tspan font-style=\"italic\">n</tspan>" "factor degrees";
+  axes "<tspan font-style=\"italic\">n</tspan>" "# factors";

   ticks coords ~x:80 ~step_x:5 ~y:110 ~step_y:10 ();
   mean
   |> List.map (fun (n,(_,t)) -> (float n, t))
   ticks coords ~x:80 ~step_x:5 ~y:110 ~step_y:10 ();
   mean
   |> List.map (fun (n,(_,t)) -> (float n, t))