Changeset ee03c0 in git
 Timestamp:
 Sep 5, 2013, 5:39:03 PM (10 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
 Children:
 e9aefc41300f0c74802c31fda85dcd345045a835
 Parents:
 d91c9d5cb9c28113b83237d7ba450d43b7f75f7d
 gitauthor:
 Martin Lee <martinlee84@web.de>20130905 17:39:03+02:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20130906 11:28:13+02:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

Singular/LIB/ncfactor.lib
rd91c9d ree03c0 1170 1170 return(result); 1171 1171 } 1172 dbprint(p,dbprintWhitespace + "We have the following intermediate list of inhomogeneous 1173 factorizations:"); 1174 dbprint(p,result); 1172 1175 dbprint(p,dbprintWhitespace +" recursively check factors for irreducibility"); 1173 1176 list recursivetemp; … … 1217 1220 checkForHomogInhomogInterchangability(result[i],2,size(result[i])); 1218 1221 }//applying the interchanges to result 1222 dbprint(p,dbprintWhitespace + "With interchanges, the result is:"); 1223 dbprint(p,resultWithInterchanges); 1219 1224 //now, refine the possible redundant list 1220 1225 return( delete_dublicates_noteval(resultWithInterchanges) ); … … 1255 1260 int p = printlevelvoice+2; 1256 1261 string dbprintWhitespace = ""; 1257 int i; int j; 1262 int i; int j; int k; 1258 1263 for (i = 1; i<=voice;i++) 1259 1264 {dbprintWhitespace = dbprintWhitespace + " ";} 1260 if (size(factors) <= 2  posLeft == posRight  1)1265 if (size(factors) <= 2  posLeft >= posRight  1) 1261 1266 {//easiest case: There is nothing to swap 1262 1267 return (list(factors)); … … 1284 1289 {//creating a new entry for the resulting list, replacing the swap in factors 1285 1290 if (j==i+1) 1286 {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][2]);} 1291 { 1292 for (k = size(attemptToSwap[1]); k >=1 ; k) 1293 { 1294 tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][k]); 1295 } 1296 j; //Because we changed entry i+1 and i 1297 } 1287 1298 else 1288 1299 { 1289 if (j == i) 1290 {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][1]);} 1291 else 1292 {tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);} 1300 tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]); 1293 1301 } 1294 1302 }//creating a new entry for the resulting list, replacing the swap in factors … … 1310 1318 {//creating a new entry for the resulting list, replacing the swap in factors 1311 1319 if (j==i+1) 1312 {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][2]);} 1320 { 1321 for (k = size(attemptToSwap[1]); k >=1 ; k) 1322 { 1323 tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][k]); 1324 } 1325 j; //Because we changed entry i+1 and i 1326 } 1313 1327 else 1314 1328 { 1315 if (j == i) 1316 {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][1]);} 1317 else 1318 {tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);} 1329 tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]); 1319 1330 } 1320 1331 }//creating a new entry for the resulting list, replacing the swap in factors … … 1324 1335 } 1325 1336 }//checking within the window posLeft <> posRight, if there are interchanges possible 1326 1327 1337 //Now we will recursively call the function for all swapped entries. 1328 1338 dbprint(p,dbprintWhitespace+ "Our list of different factorizations is now:"); … … 1434 1444 posInhomogPoly1); 1435 1445 }//Inserting factorizations 1446 dbprint(p,dbprintWhitespace + "Added a factorization to result, namely:"); 1447 dbprint(p, result[1]); 1436 1448 } 1437 1449 }//going through all by now calculated factorizations
Note: See TracChangeset
for help on using the changeset viewer.