Changeset 4301a7 in git
- Timestamp:
- Mar 22, 2000, 6:07:25 PM (24 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 779a2193d9b850b4c0d7900e062f8df304a49ab6
- Parents:
- 8b4b7b107ee9c6977877873cd4967addac43fb12
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/polys-impl.cc
r8b4b7b r4301a7 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: polys-impl.cc,v 1.3 7 2000-03-22 16:56:52Singular Exp $ */4 /* $Id: polys-impl.cc,v 1.38 2000-03-22 17:07:25 Singular Exp $ */ 5 5 6 6 /*************************************************************** … … 939 939 if (o1>o2) 940 940 { 941 return -1;941 return 1; 942 942 } 943 943 if (o1<o2) 944 944 { 945 return 1;945 return -1; 946 946 } 947 947 return 0; … … 1032 1032 case ringorder_a: 1033 1033 r=rComp_a(p1,p2,i); 1034 if (r!=0) { assume(r==rr);return r ;}1034 if (r!=0) { assume(r==rr);return rr;} 1035 1035 break; 1036 1036 … … 1039 1039 { 1040 1040 assume(rr==1); 1041 return 1;1041 return rr; 1042 1042 } 1043 1043 if (pGetComp(p1) > pGetComp(p2)) 1044 1044 { 1045 1045 assume(rr==-1); 1046 return -1;1046 return rr; 1047 1047 } 1048 1048 break; … … 1052 1052 { 1053 1053 assume(rr==1); 1054 return 1;1054 return rr; 1055 1055 } 1056 1056 if (pGetComp(p1) < pGetComp(p2)) 1057 1057 { 1058 1058 assume(rr==-1); 1059 return -1;1059 return rr; 1060 1060 } 1061 1061 break; … … 1064 1064 { 1065 1065 assume(0); // not yet implemented 1066 break;1066 return rr; 1067 1067 } 1068 1068 1069 1069 case ringorder_lp: 1070 1070 r=rComp_lex(p1,p2,i); 1071 if (r!=0) { assume(r==rr);return r ;}1071 if (r!=0) { assume(r==rr);return rr;} 1072 1072 break; 1073 1073 1074 1074 case ringorder_ls: 1075 r= rComp_lex(p1,p2,i);1076 if (r!=0) { assume(r== -rr);return -r;}1075 r= -rComp_lex(p1,p2,i); 1076 if (r!=0) { assume(r==rr);return rr;} 1077 1077 break; 1078 1078 1079 1079 case ringorder_dp: 1080 1080 r=rComp_deg(p1,p2,i); 1081 if (r!=0) { assume(r==rr);return r ;}1081 if (r!=0) { assume(r==rr);return rr;} 1082 1082 r=rComp_revlex(p1,p2,i); 1083 if (r!=0) { assume(r==rr);return r ;}1083 if (r!=0) { assume(r==rr);return rr;} 1084 1084 break; 1085 1085 1086 1086 case ringorder_Dp: 1087 1087 r=rComp_deg(p1,p2,i); 1088 if (r!=0) { assume(r==rr);return r ;}1088 if (r!=0) { assume(r==rr);return rr;} 1089 1089 r=rComp_lex(p1,p2,i); 1090 if (r!=0) { assume(r==rr);return r ;}1090 if (r!=0) { assume(r==rr);return rr;} 1091 1091 break; 1092 1092 1093 1093 case ringorder_ds: 1094 1094 r= -rComp_deg(p1,p2,i); 1095 if (r!=0) { assume(r==rr);return r ;}1095 if (r!=0) { assume(r==rr);return rr;} 1096 1096 r=rComp_revlex(p1,p2,i); 1097 if (r!=0) { assume(r==rr);return r ;}1097 if (r!=0) { assume(r==rr);return rr;} 1098 1098 break; 1099 1099 1100 1100 case ringorder_Ds: 1101 1101 r= -rComp_deg(p1,p2,i); 1102 if (r!=0) { assume(r==rr);return r ;}1102 if (r!=0) { assume(r==rr);return rr;} 1103 1103 r=rComp_lex(p1,p2,i); 1104 if (r!=0) { assume(r==rr);return r ;}1104 if (r!=0) { assume(r==rr);return rr;} 1105 1105 break; 1106 1106 1107 1107 case ringorder_wp: 1108 1108 r=rComp_a(p1,p2,i); 1109 if (r!=0) { assume(r==rr);return r ;}1109 if (r!=0) { assume(r==rr);return rr;} 1110 1110 r=rComp_revlex(p1,p2,i); 1111 if (r!=0) { assume(r==rr);return r ;}1111 if (r!=0) { assume(r==rr);return rr;} 1112 1112 break; 1113 1113 1114 1114 case ringorder_Wp: 1115 1115 r=rComp_a(p1,p2,i); 1116 if (r!=0) { assume(r==rr);return r ;}1116 if (r!=0) { assume(r==rr);return rr;} 1117 1117 r=rComp_lex(p1,p2,i); 1118 if (r!=0) { assume(r==rr);return r ;}1118 if (r!=0) { assume(r==rr);return rr;} 1119 1119 break; 1120 1120 1121 1121 case ringorder_ws: 1122 1122 r= -rComp_a(p1,p2,i); 1123 if (r!=0) { assume(r==rr);return r ;}1123 if (r!=0) { assume(r==rr);return rr;} 1124 1124 r=rComp_revlex(p1,p2,i); 1125 if (r!=0) { assume(r==rr);return r ;}1125 if (r!=0) { assume(r==rr);return rr;} 1126 1126 break; 1127 1127 1128 1128 case ringorder_Ws: 1129 1129 r= -rComp_a(p1,p2,i); 1130 if (r!=0) { assume(r==rr);return r ;}1130 if (r!=0) { assume(r==rr);return rr;} 1131 1131 r=rComp_lex(p1,p2,i); 1132 if (r!=0) { assume(r==rr);return r ;}1132 if (r!=0) { assume(r==rr);return rr;} 1133 1133 break; 1134 1134 1135 1135 case ringorder_S: 1136 1136 assume(0); 1137 break;1137 return rr; 1138 1138 1139 1139 case ringorder_s: 1140 1140 /* ro_syz */ 1141 // shall not appear: 1142 assume(0); 1143 #if 0 1141 1144 if ((pGetComp(p1) > pDBsyzComp) && (pGetComp(p2) > pDBsyzComp)) break; 1142 1145 if ((pGetComp(p1) <= pDBsyzComp) && (pGetComp(p2) <= pDBsyzComp)) break; 1143 if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return 1;} 1144 /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return -1; } 1145 break; 1146 if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return rr;} 1147 /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return rr; } 1148 #endif 1149 return rr; 1146 1150 1147 1151 case ringorder_unspec:
Note: See TracChangeset
for help on using the changeset viewer.