Changeset 90f715 in git for Singular/walk.cc


Ignore:
Timestamp:
Dec 13, 2016, 10:01:44 AM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')
Children:
1ae67730fa57673e19cd4e827e43af59b10709c1
Parents:
395bff88a6362715713dacd455c278cd6e494d75
Message:
change: use rRingOrder_t instead of int
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/walk.cc

    r395bff r90f715  
    26962696
    26972697  /*weights: entries for 3 blocks: NULL Made:???*/
     2698  omFree(r->wvhdl);
    26982699  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    26992700  r->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
    … …  
    27022703
    27032704  /* order: a,lp,C,0 */
    2704   r->order = (int *) omAlloc(nb * sizeof(int *));
     2705  omFree(r->order);
     2706  r->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     2707  omFree(r->block0);
    27052708  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2709  omFree(r->block1);
    27062710  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    27072711
    … …  
    27232727
    27242728  // the last block: everything is 0
    2725   r->order[3]  = 0;
     2729  r->order[3]  = (rRingOrder_t)0;
    27262730
    27272731  // polynomial ring
    … …  
    27472751
    27482752  //weights: entries for 3 blocks: NULL Made:???
     2753  omFree(r->wvhdl);
    27492754  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    27502755  r->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
    … …  
    27582763
    27592764  // order: (1..1),a,lp,C
    2760   r->order = (int *) omAlloc(nb * sizeof(int *));
     2765  omFree(r->order);
     2766  r->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     2767  omFree(r->block0);
    27612768  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2769  omFree(r->block1);
    27622770  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    27632771
    … …  
    27842792
    27852793  // the last block: everything is 0
    2786   r->order[4]  = 0;
     2794  r->order[4]  = (rRingOrder_t)0;
    27872795
    27882796  // complete ring intializations
    … …  
    28062814
    28072815  /*weights: entries for 3 blocks: NULL Made:???*/
     2816  omFree(r->wvhdl);
    28082817  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    28092818  r->wvhdl[0] = (int*) omAlloc(nv*nv*sizeof(int));
    … …  
    28152824
    28162825  /* order: a,lp,C,0 */
    2817   r->order = (int *) omAlloc(nb * sizeof(int *));
     2826  omFree(r->order);
     2827  r->order = (rRingOrder_t*) omAlloc(nb * sizeof(rRingOrder_t*));
     2828  omFree(r->block0);
    28182829  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2830  omFree(r->block1);
    28192831  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    28202832
    … …  
    28352847
    28362848  // the last block: everything is 0
    2837   r->order[3]  = 0;
     2849  r->order[3]  = (rRingOrder_t)0;
    28382850
    28392851  // complete ring intializations
    … …  
    28582870
    28592871  /*weights: entries for 3 blocks: NULL Made:???*/
     2872  omFree(r->wvhdl);
    28602873  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    28612874  r->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
    … …  
    28722885  }
    28732886  /* order: a,lp,C,0 */
    2874   r->order = (int *) omAlloc(nb * sizeof(int *));
     2887  omFree(r->order);
     2888  r->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     2889  omFree(r->block0);
    28752890  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2891  omFree(r->block1);
    28762892  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    28772893
    … …  
    28922908
    28932909  // the last block: everything is 0
    2894   r->order[3]  = 0;
     2910  r->order[3]  = (rRingOrder_t)0;
    28952911
    28962912  // complete ring intializations
    … …  
    29142930  /*weights: entries for 3 blocks: NULL Made:???*/
    29152931
     2932 omFree(r->wvhdl);
    29162933  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    29172934
    29182935  /* order: lp,C,0 */
    2919   r->order = (int *) omAlloc(nb * sizeof(int *));
     2936 omFree(r->order);
     2937  r->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     2938 omFree(r->block0);
    29202939  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2940 omFree(r->block1);
    29212941  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    29222942
    … …  
    29302950
    29312951  /* the last block: everything is 0 */
    2932   r->order[2]  = 0;
     2952  r->order[2]  = (rRingOrder_t)0;
    29332953
    29342954  /*polynomial ring*/
    … …  
    29542974
    29552975  /*weights: entries for 3 blocks: NULL Made:???*/
     2976  omFree(res->wvhdl);
    29562977  res->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    29572978  res->wvhdl[0] = (int*) omAlloc(nv*sizeof(int));
    … …  
    29612982  /* order: a,lp,C,0 */
    29622983
    2963   res->order = (int *) omAlloc(nb * sizeof(int *));
     2984  omFree(res->order);
     2985  res->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     2986  omFree(res->block0);
    29642987  res->block0 = (int *)omAlloc0(nb * sizeof(int *));
     2988  omFree(res->block1);
    29652989  res->block1 = (int *)omAlloc0(nb * sizeof(int *));
    29662990
    … …  
    29823006
    29833007  // the last block: everything is 0
    2984   res->order[3]  = 0;
     3008  res->order[3]  = (rRingOrder_t)0;
    29853009
    29863010  // polynomial ring
    … …  
    30053029  /*weights: entries for 3 blocks: NULL Made:???*/
    30063030
     3031  omFree(r->wvhdl);
    30073032  r->wvhdl = (int **)omAlloc0(nb * sizeof(int_ptr));
    30083033
    30093034  /* order: lp,C,0 */
    3010   r->order = (int *) omAlloc(nb * sizeof(int *));
     3035  omFree(r->order);
     3036  r->order = (rRingOrder_t *) omAlloc(nb * sizeof(rRingOrder_t *));
     3037  omFree(r->block0);
    30113038  r->block0 = (int *)omAlloc0(nb * sizeof(int *));
     3039  omFree(r->block1);
    30123040  r->block1 = (int *)omAlloc0(nb * sizeof(int *));
    30133041
    … …  
    30213049
    30223050  /* the last block: everything is 0 */
    3023   r->order[2]  = 0;
     3051  r->order[2]  = (rRingOrder_t)0;
    30243052
    30253053  /*polynomial ring*/
Note: See TracChangeset for help on using the changeset viewer.