===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ecart.sm1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- OpenXM/src/kan96xx/Doc/ecart.sm1	2003/07/25 01:03:00	1.2
+++ OpenXM/src/kan96xx/Doc/ecart.sm1	2003/07/29 08:36:39	1.3
@@ -1,4 +1,4 @@
-% $OpenXM: OpenXM/src/kan96xx/Doc/ecart.sm1,v 1.1 2003/07/25 01:00:38 takayama Exp $ 
+% $OpenXM: OpenXM/src/kan96xx/Doc/ecart.sm1,v 1.2 2003/07/25 01:03:00 takayama Exp $ 
 %[(parse) (hol.sm1) pushfile] extension
 %[(parse) (appell.sm1) pushfile] extension
 
@@ -220,21 +220,21 @@
       wv isInteger {        
         [v ring_of_differential_operators 
          [ v ecart.wv1 v ecart.wv2 ] weight_vector
-         0
+         gb.characteristic
          opt
         ] define_ring
       }{
        degreeShift isInteger {
          [v ring_of_differential_operators 
           [v ecart.wv1 v ecart.wv2] wv join weight_vector
-          0
+          gb.characteristic
           opt
          ] define_ring
 
        }{
          [v ring_of_differential_operators 
           [v ecart.wv1 v ecart.wv2] wv join weight_vector
-          0
+          gb.characteristic
           [(degreeShift) degreeShift] opt join 
           ] define_ring
 
@@ -393,5 +393,199 @@
   (    /ecart.autoHomogenize 0 def )
 ]] putUsages
 
+
+/ecartn.begin { 
+  (red@) (standard) switch_function
+%%  (red@) (ecart) switch_function
+  [(Ecart) 1] system_variable
+  [(CheckHomogenization) 0] system_variable
+  [(ReduceLowerTerms) 0] system_variable
+  [(AutoReduce) 0] system_variable
+  [(EcartAutomaticHomogenization) 0] system_variable
+} def
+/ecartn.gb {
+  /arg1 set
+  [/in-ecartn.gb /aa /typev /setarg /f /v 
+   /gg /wv /vec /ans /rr /mm
+   /degreeShift  /env2 /opt /ans.gb
+  ] pushVariables 
+  [(CurrentRingp) (KanGBmessage)] pushEnv
+  [
+    /aa arg1 def
+    aa isArray { } { ( << array >> gb) error } ifelse
+    /setarg 0 def
+    /wv 0 def
+    /degreeShift 0 def
+    /opt [(weightedHomogenization) 1] def
+    aa { tag } map /typev set
+    typev [ ArrayP ] eq
+    {  /f aa 0 get def
+       /v gb.v def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP StringP] eq
+    {  /f aa 0 get def
+       /v aa 1 get def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP RingP] eq
+    {  /f aa 0 get def
+       /v aa 1 get def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP ArrayP] eq
+    {  /f aa 0 get def
+       /v aa 1 get from_records def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP StringP ArrayP] eq
+    {  /f aa 0 get def
+       /v aa 1 get def
+       /wv aa 2 get def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP ArrayP ArrayP] eq
+    {  /f aa 0 get def
+       /v aa 1 get from_records def
+       /wv aa 2 get def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP StringP ArrayP ArrayP] eq
+    {  /f aa 0 get def
+       /v aa 1 get def
+       /wv aa 2 get def
+       /degreeShift aa 3 get def
+       /setarg 1 def
+    } { } ifelse
+    typev [ArrayP ArrayP ArrayP ArrayP] eq
+    {  /f aa 0 get def
+       /v aa 1 get from_records def
+       /wv aa 2 get def
+       /degreeShift aa 3 get def
+       /setarg 1 def
+    } { } ifelse
+
+    /env1 getOptions def
+
+    setarg { } { (ecart.gb : Argument mismatch) error } ifelse
+    
+    [(KanGBmessage) ecart.gb.verbose ] system_variable
+
+    %%% Start of the preprocess
+    v tag RingP eq {
+       /rr v def 
+    }{
+      f getRing /rr set
+    } ifelse
+    %% To the normal form : matrix expression.
+    f gb.toMatrixOfString /f set
+    /mm gb.itWasMatrix def
+
+    rr tag 0 eq {
+      %% Define our own ring
+      v isInteger {
+        (Error in gb: Specify variables) error
+      } {  } ifelse
+      wv isInteger {        
+        [v ring_of_differential_operators 
+         [ v ecart.wv1 v ecart.wv2 ] weight_vector
+         gb.characteristic
+         opt
+        ] define_ring
+      }{
+       degreeShift isInteger {
+         [v ring_of_differential_operators 
+          [v ecart.wv1 v ecart.wv2] wv join weight_vector
+          gb.characteristic
+          opt
+         ] define_ring
+
+       }{
+         [v ring_of_differential_operators 
+          [v ecart.wv1 v ecart.wv2] wv join weight_vector
+          gb.characteristic
+          [(degreeShift) degreeShift] opt join 
+          ] define_ring
+
+       } ifelse
+      } 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
+
+    } ifelse
+    %%% Enf of the preprocess
+
+    ecart.gb.verbose {
+      (The first and the second weight vectors are automatically set as follows)
+       message
+       v ecart.wv1 message
+       v ecart.wv2 message
+       degreeShift isInteger { }
+       {
+         (The degree shift is ) messagen
+         degreeShift message
+       } ifelse
+    } { } ifelse
+
+    ecartn.begin
+
+    ecart.gb.verbose { (ecartn.gb : ecart.gb without ecart division.) message } { } ifelse
+    ecart.gb.verbose { (gb.options = ) messagen gb.options message } { } ifelse
+    ecart.autoHomogenize {
+      (ecart.gb: Input polynomial or vectors are automatically h-H-homogenized.)
+      message
+    } { } ifelse
+    ecart.autoHomogenize {
+      f { {. ecart.dehomogenize} map} map /f set   
+      f ecart.homogenize01 /f set
+    }{
+      f { {. } map } map /f set
+    } ifelse
+    ecart.needSyz {
+      [f [(needSyz)] gb.options join ] groebner /gg set
+    } {  
+      [f gb.options] groebner 0 get /gg set
+    } ifelse
+
+    ecart.needSyz {
+      mm {
+       gg 0 get { /tmp set [mm tmp] toVectors } map /ans.gb set
+      } { /ans.gb gg 0 get def } ifelse
+      /ans [gg 2 get , ans.gb , gg 1 get , f ] def
+      ans pmat ;
+    } { 
+      wv isInteger {
+        /ans [gg gg {init} map] def
+      }{
+        /ans [gg gg {wv 0 get weightv init} map] def
+      }ifelse
+
+      %% Postprocess : recover the matrix expression.
+      mm {
+        ans { /tmp set [mm tmp] toVectors } map
+        /ans set
+      }{ }
+      ifelse
+    } ifelse
+
+    ecart.end
+
+    %% 
+    env1 restoreOptions  %% degreeShift changes "grade"
+
+    /arg1 ans def
+  ] pop
+  popEnv
+  popVariables
+  arg1
+} def
+(ecartn.gb[gb by non-ecart division] ) messagen-quiet 
 
 ( ) message-quiet