===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/hol.sm1,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- OpenXM/src/kan96xx/Doc/hol.sm1	2003/06/26 08:14:45	1.11
+++ OpenXM/src/kan96xx/Doc/hol.sm1	2004/05/04 07:48:47	1.14
@@ -1,4 +1,4 @@
-% $OpenXM: OpenXM/src/kan96xx/Doc/hol.sm1,v 1.10 2001/01/04 12:29:33 takayama Exp $
+% $OpenXM: OpenXM/src/kan96xx/Doc/hol.sm1,v 1.13 2003/07/29 08:36:39 takayama Exp $
 %% hol.sm1, 1998, 11/8, 11/10, 11/14, 11/25, 1999, 5/18, 6/5. 2000, 6/8
 %% rank, rrank, characteristic
 %% This file is error clean.
@@ -272,11 +272,14 @@ message-quiet
 /gb.v 1 def
 /gb.verbose 0 def
 /gb.options [ ] def
+/gb.characteristic 0 def
+/gb.homogenized 0 def
+/gb.autoHomogenize 1 def
 /gb {
   /arg1 set
   [/in-gb /aa /typev /setarg /f /v 
    /gg /wv /termorder /vec /ans /rr /mm
-   /degreeShift
+   /degreeShift  /env2
   ] pushVariables 
   [(CurrentRingp) (KanGBmessage)] pushEnv
   [
@@ -334,6 +337,8 @@ message-quiet
        /setarg 1 def
     } { } ifelse
 
+    /env1 getOptions def
+
     setarg { } { (gb : Argument mismatch) error } ifelse
     
     [(KanGBmessage) gb.verbose ] system_variable
@@ -348,25 +353,27 @@ message-quiet
     f gb.toMatrixOfString /f set
     /mm gb.itWasMatrix def
 
-    rr tag 0 eq {
+    rr tag 0 eq 
+    v isInteger not 
+    or {
       %% Define our own ring
       v isInteger {
         (Error in gb: Specify variables) error
       } {  } ifelse
       wv isInteger {        
         [v ring_of_differential_operators 
-        0] define_ring
+        gb.characteristic] define_ring
         /termorder 1 def
       }{
        degreeShift isInteger {
          [v ring_of_differential_operators 
           wv weight_vector
-         0] define_ring
+         gb.characteristic] define_ring
          wv gb.isTermOrder /termorder set
        }{
          [v ring_of_differential_operators 
           wv weight_vector
-          0
+          gb.characteristic
           [(degreeShift) degreeShift]
           ] define_ring
          wv gb.isTermOrder /termorder set
@@ -374,24 +381,26 @@ message-quiet
       } ifelse
     } {
       %% Use the ring structre given by the input.
-      v isInteger not {
-        gb.warning {
-         (Warning : the given ring definition is not used.) message
-        } { } ifelse
-      } {  } ifelse
       rr ring_def
       /wv rr gb.getWeight def
       wv gb.isTermOrder /termorder set
     } ifelse
     %%% Enf of the preprocess
 
+    termorder {
+      /gb.homogenized 0 def
+    }{
+     /gb.homogenized 1 def
+    } ifelse
     gb.verbose { (gb.options = ) messagen gb.options message } { } ifelse
     termorder {
-      f { {. dehomogenize} map } map /f set
+      f { {,,, dehomogenize} map } map /f set
       [f gb.options] groebner_sugar 0 get /gg set
     }{
-      f { {. dehomogenize} map} map /f set
-      f fromVectors { homogenize } map /f set
+      f { {,,, dehomogenize} map} map /f set
+      gb.autoHomogenize {
+        f fromVectors { homogenize } map /f set
+      } {  } ifelse
       [f gb.options] groebner 0 get /gg set
     }ifelse
     wv isInteger {
@@ -407,6 +416,7 @@ message-quiet
     }{ }
     ifelse
     %% 
+    env1 restoreOptions  %% degreeShift changes "grade"
 
     /arg1 ans def
   ] pop
@@ -474,12 +484,12 @@ message-quiet
       } {  } ifelse
       wv isInteger {        
         [v ring_of_polynomials
-        0] define_ring
+        gb.characteristic] define_ring
         /termorder 1 def
       }{
         [v ring_of_polynomials
          wv weight_vector
-        0] define_ring
+        gb.characteristic] define_ring
         wv gb.isTermOrder /termorder set
       } ifelse
     } {
@@ -751,6 +761,8 @@ message-quiet
   (a : [f v w ds]; array f; string v; array of array w; w is the weight matirx.)
   (                array ds; ds is the degree shift )
   (  )
+  (gb.authoHomogenize 1 [default])
+  ( )
   $Example 1: [ [( (x Dx)^2 + (y Dy)^2 -1) ( x y Dx Dy -1)] (x,y) $
   $             [ [ (Dx) 1 ] ] ] gb pmat ; $
   (Example 2: )
@@ -763,6 +775,9 @@ message-quiet
   (  )
   $Example 4: [[ [(x^2) (y+x)] [(x+y) (y^3)] [(2 x^2+x y) (y+x+x y^3)]] (x,y) $
   $             [ [ (x) -1 (y) -1] ] ] gb pmat ; $
+  (  )
+  $Example 5: [[ [(x^2) (y+x)] [(x+y) (y^3)] [(2 x^2+x y) (y+x+x y^3)]] (x,y) $
+  $             [ [ (x) -1 (y) -1] ]  [[0 1] [-3 1] ] ] gb pmat ; $
   (  )
   (cf. gb, groebner, groebner_sugar, syz. )
 ]] putUsages