[BACK]Return to tigers.patch CVS log [TXT][DIR] Up to [local] / OpenXM / src / tigers

Diff for /OpenXM/src/tigers/tigers.patch between version 1.1 and 1.5

version 1.1, 2000/01/07 22:53:42 version 1.5, 2020/11/01 10:28:22
Line 1 
Line 1 
   diff -urN TiGERS_0.9.orig/Makefile TiGERS_0.9/Makefile
   --- TiGERS_0.9.orig/Makefile    1999-06-12 07:05:52.000000000 +0900
   +++ TiGERS_0.9/Makefile 2020-11-01 10:49:33.000000000 +0900
   @@ -2,7 +2,7 @@
   
    # specify compiler and compiler flags
    # note to use profiling need -pg option for both compiling and linking
   -CC = gcc
   +#CC = gcc
    CFLAGS = -O3
   
    Lib_Dirs =
 diff -urN TiGERS_0.9.orig/NOTE.txt TiGERS_0.9/NOTE.txt  diff -urN TiGERS_0.9.orig/NOTE.txt TiGERS_0.9/NOTE.txt
 --- TiGERS_0.9.orig/NOTE.txt    Thu Jan  1 09:00:00 1970  --- TiGERS_0.9.orig/NOTE.txt    1970-01-01 09:00:00.000000000 +0900
 +++ TiGERS_0.9/NOTE.txt Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/NOTE.txt 2020-11-01 10:49:33.000000000 +0900
 @@ -0,0 +1 @@  @@ -0,0 +1 @@
 +This is a working directory by NT.  1999, 6/26.  +This is a working directory by NT.  1999, 6/26.
 diff -urN TiGERS_0.9.orig/README.change TiGERS_0.9/README.change  diff -urN TiGERS_0.9.orig/README.change TiGERS_0.9/README.change
 --- TiGERS_0.9.orig/README.change       Thu Jan  1 09:00:00 1970  --- TiGERS_0.9.orig/README.change       1970-01-01 09:00:00.000000000 +0900
 +++ TiGERS_0.9/README.change    Sat Jan  8 07:46:11 2000  +++ TiGERS_0.9/README.change    2020-11-01 10:49:33.000000000 +0900
 @@ -0,0 +1 @@  @@ -0,0 +1 @@
 +The original source code of TiGERS is in OpenXM_contib/TiGERS_0.9.  +The original source code of TiGERS is in OpenXM_contib/TiGERS_0.9.
 diff -urN TiGERS_0.9.orig/binomial.c TiGERS_0.9/binomial.c  diff -urN TiGERS_0.9.orig/binomial.c TiGERS_0.9/binomial.c
 --- TiGERS_0.9.orig/binomial.c  Sat Jan  8 07:42:43 2000  --- TiGERS_0.9.orig/binomial.c  1999-06-12 07:05:51.000000000 +0900
 +++ TiGERS_0.9/binomial.c       Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/binomial.c       2020-11-01 10:49:33.000000000 +0900
 @@ -12,7 +12,7 @@  @@ -12,7 +12,7 @@
  #include<stdlib.h>   #include<stdlib.h>
  #include "utils.h"   #include "utils.h"
Line 94  diff -urN TiGERS_0.9.orig/binomial.c TiGERS_0.9/binomi
Line 106  diff -urN TiGERS_0.9.orig/binomial.c TiGERS_0.9/binomi
   
  /*   /*
 diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
 --- TiGERS_0.9.orig/call.c      Sat Jan  8 07:42:43 2000  --- TiGERS_0.9.orig/call.c      1999-06-12 07:05:52.000000000 +0900
 +++ TiGERS_0.9/call.c   Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/call.c   2020-11-01 10:49:33.000000000 +0900
 @@ -15,6 +15,8 @@  @@ -15,6 +15,8 @@
  #include "gset.h"   #include "gset.h"
  #include "matrices.h"   #include "matrices.h"
Line 105  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 117  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
  /*   /*
  ** write a description of program usage to stderr   ** write a description of program usage to stderr
  */   */
   @@ -68,7 +70,7 @@
      exit(-1);
    }
   
   -FILE *infile=stdin, *outfile=stdout;
   +FILE *infile, *outfile;
    extern int rsearch_cache;
    extern int print_tree;
    extern int  print_init;
 @@ -87,7 +89,7 @@  @@ -87,7 +89,7 @@
   
  #define MATFOUND 1   #define MATFOUND 1
Line 114  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 135  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
   char *c,cc, *prog=argv[0], *ifname=0, *ofname=0;    char *c,cc, *prog=argv[0], *ifname=0, *ofname=0;
   int tmp,acnt,stat=0,counter;    int tmp,acnt,stat=0,counter;
   gset G1=0,gset_toric_ideal();    gset G1=0,gset_toric_ideal();
 @@ -205,6 +207,29 @@  @@ -100,6 +102,10 @@
      print_tree=FALSE;
      print_init=FALSE;
   
   +  /* added by noro */
   +  infile = stdin;
   +  outfile = stdout;
   +
      /* parse command line */
      while (--argc > 0 && (*++argv)[0] == '-'){
        acnt=0;
   @@ -205,6 +211,29 @@
     }      }
    }     }
   
Line 144  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 176  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
    /* output first GB if desired */     /* output first GB if desired */
    fprintf(outfile,"%% starting GB:\n");     fprintf(outfile,"%% starting GB:\n");
    fprintf(outfile,"R: %d\n",ring_N);     fprintf(outfile,"R: %d\n",ring_N);
 @@ -314,15 +339,119 @@  @@ -314,15 +343,119 @@
      return 0;       return 0;
      }       }
    }     }
Line 203  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 235  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
 +  +
 +  return M;  +  return M;
 +}  +}
   +
 +tiger_executeString_M(char *is) {  +tiger_executeString_M(char *is) {
 +  char *c,cc, *prog="tigers", *ifname=0, *ofname=0;  +  char *c,cc, *prog="tigers", *ifname=0, *ofname=0;
 +  int tmp,acnt,stat=0,counter;  +  int tmp,acnt,stat=0,counter;
 +  gset G1=0,gset_toric_ideal();  +  gset G1=0,gset_toric_ideal();
 +  int **M=0,Mn,Mm;  +  int **M=0,Mn,Mm;
 +  double tt;  +  double tt;
   +
 +  /* initialize parameters */  +  /* initialize parameters */
 +  root_only=FALSE;  +  root_only=FALSE;
 +  rsearch_cache=TRUE;  +  rsearch_cache=TRUE;
 +  print_tree=FALSE;  +  print_tree=FALSE;
 +  print_init=FALSE;  +  print_init=FALSE;
   +
 +  if ((M=imatrix_read_from_string(is,&Mm,&Mn))==0){  +  if ((M=imatrix_read_from_string(is,&Mm,&Mn))==0){
 +     fprintf(stderr,"%s: imatrix_read() failed\n",prog);  +     fprintf(stderr,"%s: imatrix_read() failed\n",prog);
 +     exit(1);  +     exit(1);
Line 250  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 282  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
 +      fprintf(outfile,"\n");  +      fprintf(outfile,"\n");
 +    }  +    }
 +  }  +  }
 +  
 +  fprintf(outfile,"]\n");  +  fprintf(outfile,"]\n");
 +  LP_free_space();  +  LP_free_space();
 +  if (G1!=0) gset_free(G1);  +  if (G1!=0) gset_free(G1);
 +}  +}
 +  
 +  
 +main(int argc, char *argv[]) {  +main(int argc, char *argv[]) { infile=stdin; outfile=stdout;
 +  if (argc > 1) {  +  if (argc > 1) {
 +    tiger_executeString_M(argv[1]);  +    tiger_executeString_M(argv[1]);
 +  }else{  +  }else{
Line 265  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
Line 297  diff -urN TiGERS_0.9.orig/call.c TiGERS_0.9/call.c
 +  }  +  }
 +}  +}
 diff -urN TiGERS_0.9.orig/gset.c TiGERS_0.9/gset.c  diff -urN TiGERS_0.9.orig/gset.c TiGERS_0.9/gset.c
 --- TiGERS_0.9.orig/gset.c      Sat Jan  8 07:42:43 2000  --- TiGERS_0.9.orig/gset.c      1999-06-12 07:05:51.000000000 +0900
 +++ TiGERS_0.9/gset.c   Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/gset.c   2020-11-01 10:49:33.000000000 +0900
 @@ -13,6 +13,7 @@  @@ -13,6 +13,7 @@
  #include "gset.h"   #include "gset.h"
  #include "matrices.h"   #include "matrices.h"
Line 302  diff -urN TiGERS_0.9.orig/gset.c TiGERS_0.9/gset.c
Line 334  diff -urN TiGERS_0.9.orig/gset.c TiGERS_0.9/gset.c
  }   }
   
  /*   /*
   diff -urN TiGERS_0.9.orig/gset.h TiGERS_0.9/gset.h
   --- TiGERS_0.9.orig/gset.h      1999-06-12 07:05:52.000000000 +0900
   +++ TiGERS_0.9/gset.h   2020-11-01 10:59:44.000000000 +0900
   @@ -40,9 +40,17 @@
    gset gset_toric_ideal(int **,int,int);
    void gset_rgb(gset g, int (*comp)(monomial,monomial));
   
   -
   -
   -
   -
   -
   -
   +void binomial_copy(binomial src,binomial dest);
   +void vertex_print(gset g1);
   +int rsearch(gset g1);
   +int exsearch(gset g1);
   +void LP_free_space();
   +int ring_read(FILE *infile);
   +void print_monomial(FILE *of, int *exps);
   +int binomial_compair(binomial b1,binomial b2);
   +void reducetrail(binomial b1, binomial b2);
   +void binomial_bumpto(binomial b1, binomial b2);
   +int monomial_rel_prime(monomial m1, monomial m2);
   +int lp_isfacet(gset g,binomial b);
   +void gset_facet_print(FILE *of,gset g);
   +int ihermite(int **S,int **U,int m, int n);
 diff -urN TiGERS_0.9.orig/memo.txt TiGERS_0.9/memo.txt  diff -urN TiGERS_0.9.orig/memo.txt TiGERS_0.9/memo.txt
 --- TiGERS_0.9.orig/memo.txt    Thu Jan  1 09:00:00 1970  --- TiGERS_0.9.orig/memo.txt    1970-01-01 09:00:00.000000000 +0900
 +++ TiGERS_0.9/memo.txt Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/memo.txt 2020-11-01 10:49:33.000000000 +0900
 @@ -0,0 +1,33 @@  @@ -0,0 +1,33 @@
 +Open XM $B2=$O#2$H$*$j$NJ}K!$,$"$j(B.  1999, 6/26  +Open XM $B2=$O#2$H$*$j$NJ}K!$,$"$j(B.  1999, 6/26
 +$B0l$D$O(B, $B=PNO$r%Q!<%5$GM}2r$9$kJ}K!!#(B  +$B0l$D$O(B, $B=PNO$r%Q!<%5$GM}2r$9$kJ}K!!#(B
Line 340  diff -urN TiGERS_0.9.orig/memo.txt TiGERS_0.9/memo.txt
Line 399  diff -urN TiGERS_0.9.orig/memo.txt TiGERS_0.9/memo.txt
 +---  $B$h$$7P83$K$J$k$H;W$&(B.  $B$3$N7P83$r%W%m%0%i%`:nK!$H$7$F5-O?$9$k$N$O(B  +---  $B$h$$7P83$K$J$k$H;W$&(B.  $B$3$N7P83$r%W%m%0%i%`:nK!$H$7$F5-O?$9$k$N$O(B
 +---  $BBg;v$G$"$m$&(B. $B$N$3$j$OF|K\$G$d$k(B.  $B$"$H$O(B, $B5i?t2r$N9=@.%W%m%0%i%`(B.  +---  $BBg;v$G$"$m$&(B. $B$N$3$j$OF|K\$G$d$k(B.  $B$"$H$O(B, $B5i?t2r$N9=@.%W%m%0%i%`(B.
 diff -urN TiGERS_0.9.orig/tigers.c TiGERS_0.9/tigers.c  diff -urN TiGERS_0.9.orig/tigers.c TiGERS_0.9/tigers.c
 --- TiGERS_0.9.orig/tigers.c    Sat Jan  8 07:42:43 2000  --- TiGERS_0.9.orig/tigers.c    1999-06-12 07:05:51.000000000 +0900
 +++ TiGERS_0.9/tigers.c Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/tigers.c 2020-11-01 10:49:33.000000000 +0900
 @@ -12,6 +12,7 @@  @@ -12,6 +12,7 @@
  #include "utils.h"   #include "utils.h"
  #include "gset.h"   #include "gset.h"
Line 402  diff -urN TiGERS_0.9.orig/tigers.c TiGERS_0.9/tigers.c
Line 461  diff -urN TiGERS_0.9.orig/tigers.c TiGERS_0.9/tigers.c
   
   
 diff -urN TiGERS_0.9.orig/toric.c TiGERS_0.9/toric.c  diff -urN TiGERS_0.9.orig/toric.c TiGERS_0.9/toric.c
 --- TiGERS_0.9.orig/toric.c     Sat Jan  8 07:42:43 2000  --- TiGERS_0.9.orig/toric.c     1999-06-12 07:05:52.000000000 +0900
 +++ TiGERS_0.9/toric.c  Sat Jan  8 07:43:41 2000  +++ TiGERS_0.9/toric.c  2020-11-01 10:49:33.000000000 +0900
 @@ -15,7 +15,7 @@  @@ -15,7 +15,7 @@
  #include "gset.h"   #include "gset.h"
  #include "matrices.h"   #include "matrices.h"
Line 425  diff -urN TiGERS_0.9.orig/toric.c TiGERS_0.9/toric.c
Line 484  diff -urN TiGERS_0.9.orig/toric.c TiGERS_0.9/toric.c
   
    /* set lex last variable to be lv */     /* set lex last variable to be lv */
    lold=ring_lv;     lold=ring_lv;
   diff -urN TiGERS_0.9.orig/utils.c TiGERS_0.9/utils.c
   --- TiGERS_0.9.orig/utils.c     1999-06-12 07:05:52.000000000 +0900
   +++ TiGERS_0.9/utils.c  2020-11-01 10:59:09.000000000 +0900
   @@ -10,6 +10,7 @@
    */
    #include<stdio.h>
    #include<stdlib.h>
   +#include<ctype.h>
   
    int eatwhite(FILE *is){
     int c;
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.5
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>