Changeset 2965b7 in git
- Timestamp:
- Nov 5, 2019, 4:41:11 PM (4 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- d5f8dba7e8c75b7403a102542715411f93bfec99
- Parents:
- ed89d8367e669ccbacc24c6423664edbc26a49ec
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/combinatorics/hdegree.cc
red89d8 r2965b7 129 129 int scDimIntRing(ideal vid, ideal Q) 130 130 { 131 #ifdef HAVE_RING 131 #ifdef HAVE_RINGS 132 132 if (rField_is_Ring(currRing)) 133 133 { … … 139 139 ideal vv = id_Head(vid,currRing); 140 140 idSkipZeroes(vv); 141 i nt j = idPosConstant(vv);142 longd;143 if( j== -1)144 { 145 d = (long)scDimInt(vv, Q);141 i = idPosConstant(vid); 142 int d; 143 if(i == -1) 144 { 145 d = scDimInt(vv, Q); 146 146 if(rField_is_Z(currRing)) 147 147 d++; … … 149 149 else 150 150 { 151 if(n_IsUnit(pGetCoeff(vv->m[ j]),currRing->cf))151 if(n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf)) 152 152 d = -1; 153 153 else 154 d = (long)scDimInt(vv, Q);154 d = scDimInt(vv, Q); 155 155 } 156 156 //Anne's Idea for std(4,2x) = 0 bug 157 longdcurr = d;157 int dcurr = d; 158 158 for(unsigned ii=0;ii<(unsigned)IDELEMS(vv);ii++) 159 159 { … … 174 174 } 175 175 idSkipZeroes(vc); 176 j= idPosConstant(vc);177 if ( j != -1) pDelete(&vc->m[j]);178 dcurr = (long)scDimInt(vc, currRing->qideal);176 i = idPosConstant(vc); 177 if (i != -1) pDelete(&vc->m[i]); 178 dcurr = scDimInt(vc, Q); 179 179 // the following assumes the ground rings to be either zero- or one-dimensional 180 if(( j==-1) && rField_is_Z(currRing))180 if((i==-1) && rField_is_Z(currRing)) 181 181 { 182 182 // should also be activated for other euclidean domains as groundfield … … 1077 1077 int i; 1078 1078 int k = ak; 1079 #if HAVE_RINGS1079 #ifdef HAVE_RINGS 1080 1080 if (rField_is_Ring(currRing) && (currRing->OrdSgn == -1)) 1081 1081 {
Note: See TracChangeset
for help on using the changeset viewer.