- Timestamp:
- Feb 15, 2022, 2:17:18 PM (2 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 127ab7c44a0a74eb1424cf8dd7c0ca03bb9df6b8
- Parents:
- fd82c0bdecd7f9c58bae5d7b3a45808f0096fd55
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libpolys/polys/monomials/ring.cc
rfd82c0 r157b51 991 991 if (r2->order[0]==ringorder_a64) l*=2; 992 992 else if (r2->order[0]==ringorder_M) l=l*l; 993 else if (r2->order[0]==ringorder_am) 994 { 995 l+=r2->wvhdl[1][r2->block1[0]-r2->block0[0]+1]+1; 996 } 993 997 tmpR.wvhdl[1]=(int*)omalloc(l*sizeof(int)); 994 998 memcpy(tmpR.wvhdl[1],r2->wvhdl[0],l*sizeof(int)); … … 1079 1083 if (r1->order[i]==ringorder_a64) l*=2; 1080 1084 else if (r1->order[i]==ringorder_M) l=l*l; 1085 else if (r1->order[i]==ringorder_am) 1086 { 1087 l+=r1->wvhdl[i][r1->block1[i]-r1->block0[i]+1]+1; 1088 } 1081 1089 tmpR.wvhdl[i]=(int*)omalloc(l*sizeof(int)); 1082 1090 memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l*sizeof(int)); … … 1109 1117 if (r2->order[i]==ringorder_a64) l*=2; 1110 1118 else if (r2->order[i]==ringorder_M) l=l*l; 1119 else if (r2->order[i]==ringorder_am) 1120 { 1121 l+=r2->wvhdl[i][r2->block1[i]-r2->block0[i]+1]+1; 1122 } 1111 1123 tmpR.wvhdl[j]=(int*)omalloc(l*sizeof(int)); 1112 1124 memcpy(tmpR.wvhdl[j],r2->wvhdl[i],l*sizeof(int)); … … 1146 1158 if (r1->order[i]==ringorder_a64) l*=2; 1147 1159 else if (r1->order[i]==ringorder_M) l=l*l; 1160 else if (r1->order[i]==ringorder_am) 1161 { 1162 l+=r1->wvhdl[i][r1->block1[i]-r1->block0[i]+1]+1; 1163 } 1148 1164 tmpR.wvhdl[i]=(int*)omalloc(l*sizeof(int)); 1149 1165 memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l*sizeof(int)); … … 1496 1512 if (r->order[j]==ringorder_a64) l*=2; 1497 1513 else if (r->order[j]==ringorder_M) l=l*l; 1514 else if (r->order[j]==ringorder_am) 1515 { 1516 l+=r->wvhdl[j][r->block1[j]-r->block0[j]+1]+1; 1517 } 1498 1518 res->wvhdl[j]=(int*)omalloc(l*sizeof(int)); 1499 1519 memcpy(res->wvhdl[j],r->wvhdl[j],l*sizeof(int)); … … 1636 1656 if (r->order[j]==ringorder_a64) l*=2; 1637 1657 else if (r->order[j]==ringorder_M) l=l*l; 1658 else if (r->order[j]==ringorder_am) 1659 { 1660 l+=r->wvhdl[j][r->block1[j]-r->block0[j]+1]+1; 1661 } 1638 1662 res->wvhdl[j+1]=(int*)omalloc(l*sizeof(int)); 1639 1663 memcpy(res->wvhdl[j+1],r->wvhdl[j],l*sizeof(int)); … … 4522 4546 if (r->order[j-1]==ringorder_a64) l*=2; 4523 4547 else if (r->order[j-1]==ringorder_M) l=l*l; 4524 wvhdl[j]=(int*)omalloc(l*sizeof(int)); /*l+1???*/ 4548 else if (r->order[j-1]==ringorder_am) 4549 { 4550 l+=r->wvhdl[j-1][r->block1[j-1]-r->block0[j-1]+1]+1; 4551 } 4552 wvhdl[j]=(int*)omalloc(l*sizeof(int)); 4525 4553 memcpy(wvhdl[j],r->wvhdl[j-1],l*sizeof(int)); 4526 4554 } … … 4710 4738 if (r->order[j]==ringorder_a64) l*=2; 4711 4739 else if (r->order[j]==ringorder_M) l=l*l; 4740 else if (r->order[j]==ringorder_am) 4741 { 4742 l+=r->wvhdl[j][r->block1[j]-r->block0[j]+1]+1; 4743 } 4712 4744 new_r->wvhdl[j]=(int*)omalloc(l*sizeof(int)); 4713 4745 memcpy(new_r->wvhdl[j],r->wvhdl[j],l*sizeof(int)); … … 4944 4976 if (r->order[i]==ringorder_a64) l*=2; 4945 4977 else if (r->order[i]==ringorder_M) l=l*l; 4978 else if (r->order[i]==ringorder_am) 4979 { 4980 l+=r->wvhdl[j][r->block1[i]-r->block0[i]+1]+1; 4981 } 4946 4982 wvhdl[j]=(int*)omalloc(l*sizeof(int)); 4947 4983 memcpy(wvhdl[j],r->wvhdl[i],l*sizeof(int));
Note: See TracChangeset
for help on using the changeset viewer.