Merge pull request #270 from jerebertho/fix_f4sat_printf

Fix f4sat printf

Author: vneiger

src/msolve/hilbert.c

@@ -1770,7 +1770,7 @@ build_matrixn_colon(int32_t *lmb, long dquot, int32_t bld,
   int32_t err = 0;
   tbr = core_nf(tbr, st, mul, bs, &err);
   if (err) {
-    printf("Problem with normalform, stopped computation.\n");
+    fprintf(stderr,"Problem with normalform, stopped computation.\n");
     exit(1);
   }
   /* printf ("reductions\n"); */
@@ -1953,7 +1953,7 @@ build_matrixn_colon(int32_t *lmb, long dquot, int32_t bld,
 	  /* 		      st, gens->vnames, 0); */
 	  success = core_nf(&tbr, &bht, &st, mul, bs);
 	  if (!success) {
-	    printf("Problem with normalform, stopped computation.\n");
+	    fprintf(stderr,"Problem with normalform, stopped computation.\n");
 	    exit(1);
 	  }
 	  /* printf ("reduction\n"); */
@@ -2002,7 +2002,7 @@ build_matrixn_colon(int32_t *lmb, long dquot, int32_t bld,
   /* 			      st, gens->vnames, 0); */
   int success = core_nf(&tbr, &bht, &st, mul, bs);
   if (!success) {
-    printf("Problem with normalform, stopped computation.\n");
+    fprintf(stderr,"Problem with normalform, stopped computation.\n");
     exit(1);
   }
   /* printf ("reductions\n"); */
@@ -2217,7 +2217,7 @@ build_matrixn_colon_no_zero(int32_t *lmb, long dquot, int32_t bld,
   int32_t err = 0;
   tbr = core_nf(tbr, st, mul, bs, &err);
   if (err) {
-    printf("Problem with normalform, stopped computation.\n");
+    fprintf(stderr,"Problem with normalform, stopped computation.\n");
     exit(1);
   }
   /* printf ("reductions\n"); */
@@ -3076,7 +3076,7 @@ static inline void build_matrixn_unstable_from_bs_trace_application(sp_matfglm_t
     int32_t err = 0;
     tbr = core_nf(tbr, md, mul, bs, &err);
     if (err) {
-      printf("Problem with normalform, stopped computation.\n");
+      fprintf(stderr,"Problem with normalform, stopped computation.\n");
       exit(1);
     }
     free(mul);

src/msolve/iofiles.c

@@ -380,7 +380,7 @@ static int32_t get_nvars(const char *fn)
     char * line = NULL;
     char * line2 = NULL;
     size_t len;
-    nvars_t nvars = -1; 
+    nvars_t nvars = -1;
 
     /* number of variables is read from first line, it is 1 + (number of commata) */
     if (getline(&line, &len, fh) != -1)
@@ -523,7 +523,7 @@ static void get_variables(FILE *fh, char * line, int max_line_size,
   if (fgets(line, max_line_size, fh) != NULL) {
     tmp = line;
   } else {
-    printf("Bad file format (variable names).\n");
+    fprintf(stderr,"Bad file format (variable names).\n");
     /* free(vnames);
      * free(line); */
     fclose(fh);
@@ -612,11 +612,11 @@ static void remove_trailing_delim(char *line, ssize_t *len, char delim) {
     }
 }
 
-static void get_nterms_and_all_nterms(FILE *fh, 
+static void get_nterms_and_all_nterms(FILE *fh,
                                       int max_line_size, data_gens_ff_t *gens,
                                       int32_t *nr_gens, nelts_t *nterms, nelts_t *all_nterms){
 
-    char *line  = NULL; 
+    char *line  = NULL;
     size_t size;
     ssize_t len;
     for (int32_t i = 0; i < *nr_gens; i++) {
@@ -873,7 +873,7 @@ static void get_coeffs_and_exponents_ff32(FILE *fh, nelts_t all_nterms,
     size_t size;
     ssize_t len;
 
-    char *line  = NULL; 
+    char *line  = NULL;
     if(getline(&line, &size, fh) !=-1){
     }
     if(getline(&line, &size, fh) !=-1){
@@ -909,7 +909,7 @@ static void get_coeffs_and_exponents_mpz(FILE *fh, nelts_t all_nterms,
     size_t size;
     ssize_t len;
 
-    char *line  = NULL; 
+    char *line  = NULL;
     if(getline(&line, &size, fh) !=-1){
     }
     if(getline(&line, &size, fh) !=-1){
@@ -978,11 +978,11 @@ static inline void get_data_from_file(char *fn, int32_t *nr_vars,
                                       int32_t *nr_gens, data_gens_ff_t *gens){
   *nr_vars = get_nvars(fn);
   if (*nr_vars == -1)
-    printf("Bad file format (first line).\n");
+    fprintf(stderr,"Bad file format (first line).\n");
 
   *nr_gens = get_ngenerators(fn);
   if (*nr_gens == -1)
-    printf("Bad file format (generators).\n");
+    fprintf(stderr,"Bad file format (generators).\n");
 
   const int max_line_size  = 1073741824;
   char *line  = (char *)malloc((nelts_t)max_line_size * sizeof(char));

src/msolve/lifting-gb.c

@@ -722,7 +722,7 @@ static int32_t gb_modular_trace_learning(gb_modpoly_t modgbs,
     st->f4_qq_round = 1;
     bs = core_gba(bs_qq, st, &err, fc);
     if (err) {
-      printf("Problem with F4, stopped computation.\n");
+      fprintf(stderr,"Problem with F4, stopped computation.\n");
       exit(1);
     }
 
@@ -1773,7 +1773,7 @@ gb_modpoly_t *groebner_qq(
       return NULL;
   }
   if (success == 0) {
-      printf("Bad input data, stopped computation.\n");
+      fprintf(stderr,"Bad input data, stopped computation.\n");
       exit(1);
   }
 
@@ -1783,7 +1783,7 @@ gb_modpoly_t *groebner_qq(
   gb_modpoly_t *modgbsp = malloc(sizeof(gb_modpoly_t));
   modgbsp = core_groebner_qq(modgbsp, bs, msd, md, &err, field_char, print_gb);
   if (err) {
-      printf("Problem with groebner_qq, stopped computation (%d).\n", err);
+      fprintf(stderr,"Problem with groebner_qq, stopped computation (%d).\n", err);
       exit(1);
   }
 
@@ -1948,7 +1948,7 @@ int64_t export_groebner_qq(
     int err = 0;
 
     gb_modpoly_t *modgbsp = malloc(sizeof(gb_modpoly_t));
-    modgbsp = 
+    modgbsp =
     core_groebner_qq(modgbsp, bs, msd, md, &err, field_char,
             2/* if set to 1, only the LM of the Gbs are correct */);
     if (err) {

src/msolve/msolve.c

@@ -3998,14 +3998,14 @@ int core_msolve(
                         st->gfc);
             }
             if (!success) {
-                printf("Bad input data, stopped computation.\n");
+                fprintf(stderr,"Bad input data, stopped computation.\n");
                 exit(1);
             }
             /* compute a gb for initial generators */
             success = core_sba_schreyer(&bs, &bht, &st);
 
             if (!success) {
-                printf("Problem with sba, stopped computation.\n");
+                fprintf(stderr,"Problem with sba, stopped computation.\n");
                 exit(1);
             }
             int64_t nb  = export_results_from_gba(bld, blen, bexp,
@@ -4068,7 +4068,7 @@ int core_msolve(
                     0 /*truncate_lifting */, info_level);
 
             if (!success) {
-                printf("Bad input data, stopped computation.\n");
+                fprintf(stderr,"Bad input data, stopped computation.\n");
                 exit(1);
             }
 
@@ -4094,7 +4094,7 @@ int core_msolve(
                 success = core_f4sat(bs, sat, st, &error);
 
                 if (!success) {
-                    printf("Problem with f4sat, stopped computation.\n");
+                    fprintf(stderr,"Problem with f4sat, stopped computation.\n");
                     exit(1);
                 }
                 int64_t nb  = export_results_from_gba(bld, blen, bexp,
@@ -4166,7 +4166,7 @@ int core_msolve(
                         st->gfc);
             }
             if (!success) {
-                printf("Bad input data, stopped computation.\n");
+                fprintf(stderr,"Bad input data, stopped computation.\n");
                 exit(1);
             }
 
@@ -4192,7 +4192,7 @@ int core_msolve(
                 bs = core_gba(bs, st, &err, gens->field_char);
 
                 if (err) {
-                    printf("Problem with F4, stopped computation.\n");
+                    fprintf(stderr,"Problem with F4, stopped computation.\n");
                     exit(1);
                 }
             }
@@ -4226,7 +4226,7 @@ int core_msolve(
             tbr = core_nf(tbr, st, mul, bs, &err);
 
             if (err) {
-                printf("Problem with normalform, stopped computation.\n");
+                fprintf(stderr,"Problem with normalform, stopped computation.\n");
                 exit(1);
             }
             /* print reduced element in tbr, last one is the input element */
@@ -4546,7 +4546,7 @@ int core_msolve(
 
             st->gfc  = gens->field_char;
             if (!success) {
-                printf("Bad input data, stopped computation.\n");
+                fprintf(stderr,"Bad input data, stopped computation.\n");
                 exit(1);
             }
 
@@ -4585,7 +4585,7 @@ int core_msolve(
             tbr = core_nf(tbr, st, mul, bs, &err);
 
             if (err) {
-                printf("Problem with normalform, stopped computation.\n");
+                fprintf(stderr,"Problem with normalform, stopped computation.\n");
                 exit(1);
             }
             /* print all reduced elements in tbr, first normal_form ones
@@ -4959,7 +4959,9 @@ int core_msolve(
                 sat_qq->lmps[k]  = k; /* fix input element in tbr */
             }
 
-            printf("LEARNING PHASE -- PART 1\n");
+            if (info_level){
+                fprintf(stdout,"LEARNING PHASE -- PART 1\n");
+            }
             f4sat_trace_learning_phase_1(
                     trace,
                     tht,
@@ -4988,7 +4990,9 @@ int core_msolve(
 
             lp->p[0]  = prime;
 
-            printf("LEARNING PHASE -- PART 2\n");
+            if (info_level){
+                fprintf(stdout,"LEARNING PHASE -- PART 2\n");
+            }
             f4sat_trace_learning_phase_2(
                     trace,
                     tht,

src/neogb/f4.c

@@ -80,7 +80,7 @@ void free_f4_julia_result_data(
     int64_t len = 0;
     for (i = 0; i < ngens; ++i) {
         len += (int64_t)lens[i];
-    } 
+    }
 
     (*freep)(lens);
     lens  = NULL;
@@ -407,7 +407,7 @@ static int32_t initialize_f4(
     *lbsp  = bs;
     *matp  = mat;
     *lmdp  = md;
-    
+
     return done;
 }
 
@@ -690,7 +690,7 @@ bs_t *core_f4(
     /* let's start the f4 rounds, we are done when no more spairs
        are left in the pairset or if we found a constant in the basis. */
     print_round_information_header(stdout, md);
-    
+
     /* reset error */
     *errp = 0;
     while (!done) {
@@ -815,15 +815,15 @@ int64_t export_f4(
         return 1;
     }
     if (success == 0) {
-        printf("Bad input data, stopped computation.\n");
+        fprintf(stderr,"Bad input data, stopped computation.\n");
         exit(1);
     }
 
     int err = 0;
     bs = core_f4(bs, md, &err, field_char);
 
     if (err) {
-        printf("Problem with F4, stopped computation.\n");
+        fprintf(stderr,"Problem with F4, stopped computation.\n");
         exit(1);
     }
 

src/neogb/f4sat.c

@@ -43,7 +43,7 @@ static inline int is_pure_power(
     const len_t ebl = ht->ebl;
     const len_t evl = ht->evl;
     const len_t nv  = ht->nv;
-    
+
     for (i = 1; i < ebl; ++i) {
         if (ev[i] == 0) {
             ctr++;
@@ -69,7 +69,7 @@ static inline int is_zero_dimensional(
     len_t i;
 
     len_t ctr = 0;
-    
+
     const len_t nv  = ht->nv;
     const len_t lml = bs->lml;
 
@@ -78,7 +78,7 @@ static inline int is_zero_dimensional(
             ctr ++;
         }
     }
-    
+
     if (ctr == nv) {
         return 1;
     }
@@ -94,7 +94,9 @@ static int is_already_saturated(
         md_t *st
         )
 {
-    printf("testing if system is already saturated: ");
+    if(st->info_level){
+      printf("testing if system is already saturated: ");
+    }
     double rrt0, rrt1;
     rrt0  = realtime();
 
@@ -120,7 +122,7 @@ static int is_already_saturated(
     memcpy(lmps, bs->lmps, (unsigned long)lml * sizeof(bl_t));
     int8_t *red     = (int8_t *)malloc((unsigned long)bs->sz * sizeof(int8_t));
     memcpy(red, bs->red, (unsigned long)bs->sz * sizeof(int8_t));
-    
+
     ps_t *ps = st->ps;
 
     cf32_t *cf  = (cf32_t *)malloc(
@@ -137,7 +139,7 @@ static int is_already_saturated(
     bs->hm[bs->ld]    = hm;
 
     update_basis_f4(ps, bs, bht, st, 1);
-    
+
     /* suppress infolevel printing in the test step */
     int32_t infolevel = st->info_level;
     st->info_level  = 0;
@@ -201,10 +203,12 @@ static int is_already_saturated(
     *bhtp = bht;
     *shtp = sht;
 
-    if (is_constant == 1) {
+    if (st->info_level){
+      if (is_constant == 1) {
         printf("yes.");
-    } else {
+      } else {
         printf("no.");
+      }
     }
 
     rrt1 = realtime();

src/neogb/io.c

@@ -407,7 +407,7 @@ void import_input_data(
     }
     /* maybe some input elements are invalid, so reset ngens here */
     ngens = ctr;
-            
+
     /* set total degree of input polynomials */
     deg_t deg = 0;
     if (st->nev) {
@@ -831,7 +831,7 @@ int32_t check_and_set_meta_data(
     /* elimination block order? If so, store the blocks length */
     st->nev = elim_block_len >= 0 ? elim_block_len : 0;
     if (st->nev >= st->nvars) {
-        printf("error: Too large elimination block.\n");
+        fprintf(stderr,"error: Too large elimination block.\n");
         exit(1);
     }
     /* set hash table size */
@@ -1119,7 +1119,7 @@ int32_t check_and_set_meta_data_trace(
     return check_and_set_meta_data(st, lens, exps, cfs, invalid_gens,
             field_char, mon_order, elim_block_len, nr_vars, nr_gens,
             nr_nf, ht_size, nr_threads, max_nr_pairs, reset_hash_table,
-            la_option, use_signatures, reduce_gb, pbm_file, truncate_lifting, 
+            la_option, use_signatures, reduce_gb, pbm_file, truncate_lifting,
             info_level);
 }