Changeset 8e176b in git

Timestamp:

Apr 24, 2014, 10:48:27 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

423ed4132d991ece24b8528843d5c19c0ef08e3d493e3de68a992f8a472eb2c2c57ca110ca7ef492

Parents:

5b267b814940e31df029cf3b609a965ad80cebfc

Message:

chg: hasIntegerCoefficientRing ->hasRingCoefficientRing

hasIntegerCoefficientRing handled only some special cases
and in an error prone way (relying in string representations).
hasRingCoefficientRing tests for the case where the coeffcients are not a
field which requires special care/different alg. in many cases

Files:

• Singular/LIB/ring.lib (modified) (4 diffs)
• Singular/LIB/sing.lib (modified) (1 diff)
• Tst/Short/ringutils_s.res.gz.uu (modified) (1 diff)
• Tst/Short/ringutils_s.tst (modified) (1 diff)

Singular/LIB/ring.lib

@@ -23 +23 @@
              (parameters in square brackets [] are optional)
  optionIsSet(opt)         check if as a string given option is set or not.
+ hasRingCoefficientRing   check if the coefficient ring is not a field
+ hasNumericCoeffs(rng)    check for use of floating point numbers
+ hasCommutativeVars(rng)  non-commutive or commnuative polynomial ring
+ hasGlobalOrdering(rng)   global versus mixed/local monomial ordering
+ isSubModule(I,J)         check if I is in J as submodule
 ";
 
@@ -47 +52 @@
 }
 example
-{ 
+{
     // check if the option "warn" is set.
     optionIsSet("warn");
@@ -908 +913 @@
   ring rng = 0,x,dp;
   isQuotientRing(rng); //no
-  // if a certain method does not support quotient rings, 
+  // if a certain method does not support quotient rings,
   // then a parameter test could be performed:
    ASSUME( 0, 0==isQuotientRing(basering));
 
-  qring q= ideal(x);  // constructs rng/ideal(x) 
+  qring q= ideal(x);  // constructs rng/ideal(x)
   isQuotientRing(q);  // yes
 }
@@ -937 +942 @@
 }
 
-
-
-
-
-proc hasIntegerCoefficientRing( rng )
-"USAGE: hasIntegerCoefficientRing ( rng );
-RETURN:  1 if rng is has integer ring coefficients, 0 otherwise.
-KEYWORDS: integer ring coefficients 
-EXAMPLE: example hasIntegerCoefficientRing ; shows an example
-"
-proc hasIntegerCoefficientRing(rng)
-{
-  def rl = ringlist(rng);
-  if ( not (typeof(rl[1][1])=="string")    ) { return (0); }
-  return ( rl[1][1]=="integer" );
+proc hasRingCoefficientRing( rng )
+"USAGE: hasRingCoefficientRing ( rng );
+RETURN:  1 if rng is has ring coefficients, 0 otherwise.
+KEYWORDS: ring coefficients
+EXAMPLE: example hasRingCoefficientRing; shows an example
+"
+{
+  return (attrib(rng,"ring_cf")==1);
 }
 example
 {
   ring rng = integer,x,dp;
-  hasIntegerCoefficientRing(rng); //yes
-  // if a certain method supports only rings with integer coefficients, 
+  hasRingCoefficientRing(rng); //yes
+  // if a certain method supports only rings with integer coefficients,
   // then a parameter test could be performed:
-   ASSUME( 0, hasIntegerCoefficientRing(basering)); //ok
-
-  ring rng2 = 0, x, dp; 
-  hasIntegerCoefficientRing(rng2);  // no
-}
-
-
-static proc testHasIntegerCoefficientRing()
-{
-   ring rng = integer,x,dp;
-   ASSUME(0, hasIntegerCoefficientRing( rng ) );
-
-   qring q = ideal(x);
-   ASSUME(0, hasIntegerCoefficientRing( q ) );
-
-   ring rng2 = 0,x,dp;
-   ASSUME(0, 0==hasIntegerCoefficientRing( rng2 ) );
-
-   ring rng3 = (0,a),x,dp;
-   ASSUME(0, 0==hasIntegerCoefficientRing( rng3 ) );
-
-   ring rng4 = (real,a),x,dp;
-   ASSUME(0, 0==hasIntegerCoefficientRing( rng4 ) );
-
-   ring rng5 = (real),x,dp;
-   ASSUME(0, 0==hasIntegerCoefficientRing( rng5 ) );
-}
-
-
-
-
+  ring rng2 = 0, x, dp;
+  hasRingCoefficientRing(rng2);  // no
+}
+
+proc hasGlobalOrdering (rng)
+"USAGE: hasGlobalOrdering ( rng );
+RETURN:  1 if rng has a global monomial ordering, 0 otherwise.
+KEYWORDS: monomial ordering
+EXAMPLE: example hasGlobalOrdering; shows an example
+"
+{
+  return (attrib(rng,"global")==1);
+}
+example
+{
+  ring rng = integer,x,dp;
+  hasGlobalOrdering(rng); //yes
+  ring rng2 = 0, x, ds;
+  hasGlobalOrdering(rng2);  // no
+}
+
+proc hasCommutativeVars (rng)
+"USAGE: hasCommutativeVars ( rng );
+RETURN:  1 if rng is a commutative polynomial ring, 0 otherwise.
+KEYWORDS: plural
+EXAMPLE: example hasCommutativeVars; shows an example
+"
+{
+  list rl=ringlist(rng);
+  return (size(rl)==4);
+}
+
+proc hasNumericCoeffs(rng)
+"USAGE: hasNumericCoeffs ( rng );
+RETURN:  1 if rng has inexact coeffcients, 0 otherwise.
+KEYWORDS: floating point
+EXAMPLE: example hasNumericCoeffs; shows an example
+"
+{
+  ERROR("not yet implemented");
+}
+
+proc isSubModule(I,J)
+"USAGE: isSubModule(I,J): I, J: ideal or module
+RETURN: 1 if module(I) is in module(J), 0 otherwise
+EXAMPLE: isSubModule; shows an example
+{
+  if (attrib(J,"isSB")==1)
+  { return(size(reduce(I,J,1)==0)); }
+  else
+  { return(size(reduce(I,groebner(J),1)==0)); }
+}
+
+

Singular/LIB/sing.lib

@@ -371 +371 @@
   ASSUME( 0, 0==isQuotientRing(basering) ); 
   // integer coefficient rings currently not supported
-  ASSUME( 0, 0==hasIntegerCoefficientRing(basering) ); 
+  ASSUME( 0, 0==hasRingCoefficientRing(basering) ); 
 
 

Tst/Short/ringutils_s.res.gz.uu

@@ -1 @@
-begin 664 ringutils_s.res.gz
-M'XL("/["YU(``W)I;F=U=&EL<U]S+G)E<P!MD#T+PC`0AO?^BJ,XI,M!U-:/
-M0@9UL"""5N>B$DN@I-)<<1#_NTV11,4EN8_WY;F[_+#*M@#`!6RR!81D""MU
-M#M,@?W>&`KIBH;0B%J6!_4$(:)0N6U*5*0QJ>4=#)W*>D0`7C]'',5H*"ZVY
-MQT2>DWQX)@BWIKX`24/[3GNT(!:Y_A3AX9(9=H]5S>=6GYE=6Y.2NG<R3^#\
-M6[@^F4R3+&6SK.7UJB[_/".$ITO&XG<B+XS]^#SQ*_-N%7L^>Y[6,!ZE,$B#
-)%TG,>MEV`0``
+begin 640 ringutils_s.res.gz
+M'XL(",D5'U,``W)I;F=U=&EL<U]S+G)E<P"-E5]OVC`4Q=_Y%%?1'@*B(;$=
+M"$*)M'\/2&NE+MMSR8KI+"&GQ&;MQY]#B7T=MA2DB"B<>W['EQN[_/%E?0<`
+M20'?UI\@T$I'>_$K6(W*\R^D`//P04BAP_%JU'Y#44`CY--1B[UZ4)'D+Y'2
+ME;8UM`![SR)WGT8M)6AK>Y0YJEA$4#]K4<LP>*D:&8R=+"O@8UG^O/T:QM.S
+M:*U*KCLE&.UL!I,)'!6'C9#Z#W_<@)!*\VH+]0XV6[[;6+]E85&R[L&2&,-B
+MR//_$;L"T\39[&;@8Y4D.C40&G/ET/!J/WV=;I^=%?78!BW4_;'6@DO]W12&
+MIM"@P14PU\#$M/EPLC^\^2=.-L>^/<_#A>D"F68N,C&>IK7\B3>]V,N+EEWF
+M)AZ#Q(Y!$AR<Y+%3$6PL:_VO[#UC-(2$N?#4A(_]V"2](C;UW='`D@6.37/7
+M;I*]T^Z>Z7)X@#H=C;WQ\?^*M_%ON)ES\ZZ>19.)K4UPI-^5:K-\KOEN)QYM
+MM%,-'FU*W'(IM<MMX5LSO.$KDK)K``??/D7V<W_0XH%U$;RP1>^5&5@;\>D9
+MHB_]23%>U7@@`44)6'Q]`NHE8(E+P-#>P-H$I]W!ANA4_0UB@,5\%MHI6.I8
+I:<?JD^;7DU*?A+8/EKEC@)D>MT=*>V0<59B,5_!A-?H+JYB*6XH&````
 `
 end

Tst/Short/ringutils_s.tst

@@ -3 +3 @@
 
 
-LIB("ring.lib");
+LIB"ring.lib";
 
-proc testRingUtils()
-{
-  Ring::testIsQuotientRing();
-  Ring::testHasIntegerCoefficientRing();
-}
-testRingUtils();
+option("warn");
+ASSUME(0, optionIsSet("warn") );
+option("nowarn");
+ASSUME(0, 0 == optionIsSet("warn") );
+//----------------------------
+ring rng = real,x,dp;
+ASSUME(0, 0== isQuotientRing(rng) ) ;
+
+qring qrng = 1;
+ASSUME(0, isQuotientRing(qrng) ) ;
+
+ring rng2 = integer,x,dp;
+ASSUME(0, 0 == isQuotientRing(rng2) ) ;
+
+qring qrng2=0;
+ASSUME(0, not isQuotientRing(qrng2) ) ;
+
+ring rng3 = 0,x,dp;
+ASSUME(0, 0 == isQuotientRing(rng3) ) ;
+
+qring qrng3=1;
+ASSUME(0, isQuotientRing(qrng3) ) ;
+//--------------------------
+ring rng = integer,x,dp;
+ASSUME(0, hasRingCoefficientRing( rng ) );
+
+qring q = ideal(x);
+ASSUME(0, hasRingCoefficientRing( q ) );
+
+ring rng2 = 0,x,dp;
+ASSUME(0, 0==hasRingCoefficientRing( rng2 ) );
+
+ring rng3 = (0,a),x,dp;
+ASSUME(0, 0==hasRingCoefficientRing( rng3 ) );
+
+ring rng4 = (real,a),x,dp;
+ASSUME(0, 0==hasRingCoefficientRing( rng4 ) );
+
+ring rng5 = (real),x,dp;
+ASSUME(0, 0==hasRingCoefficientRing( rng5 ) );