[BACK]Return to gf.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / builtin

Diff for /OpenXM_contrib2/asir2018/builtin/gf.c between version 1.2 and 1.3

version 1.2, 2018/09/28 08:20:27 version 1.3, 2020/10/06 06:31:19
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2018/builtin/gf.c,v 1.1 2018/09/19 05:45:06 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/builtin/gf.c,v 1.2 2018/09/28 08:20:27 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 458  void resf_dtest(P f,ML list,int nb,int *nfl,int *mdl,D
Line 458  void resf_dtest(P f,ML list,int nb,int *nfl,int *mdl,D
       }        }
       if ( ( np -= k ) < k )        if ( ( np -= k ) < k )
         break;          break;
       if ( np - win[0] + 1 < k )        if ( np - win[0] + 1 < k ) {
         if ( ++k > np )          if ( ++k > np )
           break;            break;
         else          else
           for ( i = 0; i < k; i++ )            for ( i = 0; i < k; i++ )
             win[i] = i + 1;              win[i] = i + 1;
       else        } else
         for ( i = 1; i < k; i++ )          for ( i = 1; i < k; i++ )
           win[i] = win[0] + i;            win[i] = win[0] + i;
     } else if ( !ncombi(1,np,k,win) )      } else if ( !ncombi(1,np,k,win) ) {
       if ( k == np )        if ( k == np )
         break;          break;
       else        else
         for ( i = 0, ++k; i < k; i++ )          for ( i = 0, ++k; i < k; i++ )
           win[i] = i + 1;            win[i] = i + 1;
       }
   }    }
   NEXTDC(dcf0,dcf); COEF(dcf) = g;    NEXTDC(dcf0,dcf); COEF(dcf) = g;
   DEG(dcf) = ONE; NEXT(dcf) = 0;*dcp = dcf0;    DEG(dcf) = ONE; NEXT(dcf) = 0;*dcp = dcf0;
Line 1284  void showgfmat(UM **mat,int n)
Line 1285  void showgfmat(UM **mat,int n)
           if ( k > 1 )            if ( k > 1 )
             fprintf(asir_out,"a^%d",k);              fprintf(asir_out,"a^%d",k);
           else if ( k == 1 )            else if ( k == 1 )
             fprintf(asir_out,"a",k);              fprintf(asir_out,"a");
         }          }
       fprintf(asir_out," ");        fprintf(asir_out," ");
     }      }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>