[BACK]Return to dp-supp.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/dp-supp.c between version 1.16 and 1.19

version 1.16, 2001/09/17 01:18:34 version 1.19, 2001/09/19 09:10:34
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/asir2000/builtin/dp-supp.c,v 1.15 2001/09/11 08:56:47 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.18 2001/09/17 10:32:40 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 641  DP *rp;
Line 641  DP *rp;
         for ( i = 0, td = 0; i < n; i++ ) {          for ( i = 0, td = 0; i < n; i++ ) {
                 w[i] = MAX(d1->d[i],d2->d[i]); td += w[i];                  w[i] = MAX(d1->d[i],d2->d[i]); td += w[i];
         }          }
         NEWDL(d,n); d->td = td - d1->td;          NEWDL_NOINIT(d,n); d->td = td - d1->td;
         for ( i = 0; i < n; i++ )          for ( i = 0; i < n; i++ )
                 d->d[i] = w[i] - d1->d[i];                  d->d[i] = w[i] - d1->d[i];
         NEWMP(m); m->dl = d; m->c = (P)BDY(p2)->c; NEXT(m) = 0;          NEWMP(m); m->dl = d; m->c = (P)BDY(p2)->c; NEXT(m) = 0;
         MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p1,s,&t);          MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p1,s,&t);
         NEWDL(d,n); d->td = td - d2->td;          NEWDL_NOINIT(d,n); d->td = td - d2->td;
         for ( i = 0; i < n; i++ )          for ( i = 0; i < n; i++ )
                 d->d[i] = w[i] - d2->d[i];                  d->d[i] = w[i] - d2->d[i];
         NEWMP(m); m->dl = d; m->c = (P)BDY(p1)->c; NEXT(m) = 0;          NEWMP(m); m->dl = d; m->c = (P)BDY(p1)->c; NEXT(m) = 0;
Line 844  DP *rp;
Line 844  DP *rp;
         _mulmd_dup(mod,s,p2,&t); _free_dp(s);          _mulmd_dup(mod,s,p2,&t); _free_dp(s);
 #else  #else
         if ( do_weyl ) {          if ( do_weyl ) {
                 _weyl_mulmdm_dup(mod,p2,m,&t); _FREEMP(m);                  _MKDP(n,m,s); s->sugar = d->td;
                   _mulmd_dup(mod,s,p2,&t); _free_dp(s);
         } else {          } else {
                 _mulmdm_dup(mod,p2,m,&t); _FREEMP(m);                  _mulmdm_dup(mod,p2,m,&t); _FREEMP(m);
         }          }
Line 852  DP *rp;
Line 853  DP *rp;
 /* get_eg(&t0); */  /* get_eg(&t0); */
         _addmd_destructive(mod,p1,t,rp);          _addmd_destructive(mod,p1,t,rp);
 /* get_eg(&t1); add_eg(&eg_red_mod,&t0,&t1); */  /* get_eg(&t1); add_eg(&eg_red_mod,&t0,&t1); */
         _print_mp(NV(*rp),BDY(*rp));  
 }  }
   
 /*  /*
Line 1729  MP m;
Line 1729  MP m;
 {  {
         int i;          int i;
   
         if ( m )          if ( !m )
                 return;                  return;
         for ( ; m; m = NEXT(m) ) {          for ( ; m; m = NEXT(m) ) {
                 fprintf(stderr,"%d<",ITOS(C(m)));                  fprintf(stderr,"%d<",ITOS(C(m)));
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.19
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>