===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ecart.sm1,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM/src/kan96xx/Doc/ecart.sm1	2003/07/30 09:00:51	1.4
+++ OpenXM/src/kan96xx/Doc/ecart.sm1	2003/08/13 03:52:25	1.6
@@ -1,4 +1,4 @@
-% $OpenXM: OpenXM/src/kan96xx/Doc/ecart.sm1,v 1.3 2003/07/29 08:36:39 takayama Exp $ 
+% $OpenXM: OpenXM/src/kan96xx/Doc/ecart.sm1,v 1.5 2003/08/04 11:42:42 takayama Exp $ 
 %[(parse) (hol.sm1) pushfile] extension
 %[(parse) (appell.sm1) pushfile] extension
 
@@ -219,21 +219,23 @@
       } {  } ifelse
       wv isInteger {        
         [v ring_of_differential_operators 
-         [ v ecart.wv1 v ecart.wv2 ] weight_vector
+%         [ 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
+%          [v ecart.wv1 v ecart.wv2] wv join weight_vector
+          wv weight_vector
           gb.characteristic
           opt
          ] define_ring
 
        }{
          [v ring_of_differential_operators 
-          [v ecart.wv1 v ecart.wv2] wv join weight_vector
+%          [v ecart.wv1 v ecart.wv2] wv join weight_vector
+          wv  weight_vector
           gb.characteristic
           [(degreeShift) degreeShift] opt join 
           ] define_ring
@@ -254,7 +256,7 @@
     %%% Enf of the preprocess
 
     ecart.gb.verbose {
-      (The first and the second weight vectors are automatically set as follows)
+      (The first and the second weight vectors for automatic homogenization: )
        message
        v ecart.wv1 message
        v ecart.wv2 message
@@ -265,6 +267,9 @@
        } ifelse
     } { } ifelse
 
+    %%BUG: case of v is integer
+    v ecart.checkOrder
+
     ecart.begin
 
     ecart.gb.verbose { (gb.options = ) messagen gb.options message } { } ifelse
@@ -338,7 +343,7 @@
   (               not to dehomogenize and homogenize)
   ( )
   $Example 1: [ [( (x Dx)^2 + (y Dy)^2 -1) ( x y Dx Dy -1)] (x,y) $
-  $             [ [ (Dx) 1 ] ] ] ecart.gb pmat ; $
+  $             [ [ (Dx) 1 ] [(x) -1 (y) -1 (Dx) 1 (Dy) 1]] ] ecart.gb pmat ; $
   (Example 2: )
   (To put H and h=1, type in, e.g., )
   $ [ [(2 x Dx + 3 y Dy+6) (2 y Dx + 3 x^2 Dy)] (x,y) $
@@ -348,10 +353,10 @@
   $             [ [ (Dx) 1 (Dy) 1] ] ] ecart.gb pmat ; $
   (  )
   $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] ] ] ecart.gb pmat ; $
+  $             [ [ (x) -1 (y) -1] [(x) -1 (y) -1 (Dx) 1 (Dy) 1]] ] ecart.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] ] ] ecart.gb pmat ; $
+  $             [ [(Dx) 1 (Dy) 1] [(x) -1 (y) -1 (Dx) 1 (Dy) 1] ]  [[0 1] [-3 1] ] ] ecart.gb pmat ; (buggy infinite loop)$
   (  )
   (cf. gb, groebner, ecart.syz, ecart.begin, ecart.end, ecart.homogenize01, )
   (    ecart.dehomogenize, ecart.dehomogenizeH)
@@ -534,6 +539,9 @@
        } ifelse
     } { } ifelse
 
+    %%BUG: case of v is integer
+    v ecart.checkOrder
+
     ecartn.begin
 
     ecart.gb.verbose { (ecartn.gb : ecart.gb without ecart division.) message } { } ifelse
@@ -712,6 +720,9 @@
        } ifelse
     } { } ifelse
 
+    %%BUG: case of v is integer
+    v ecart.checkOrder
+
     ecart.begin
     [(EcartAutomaticHomogenization) 1] system_variable
 
@@ -762,4 +773,63 @@
 } def
 (ecartd.gb[results are dehomogenized at each reduction step] ) messagen-quiet 
 
+/ecart.checkOrder {
+  /arg1 set
+  [/in-ecart.checkOrder /vv /tt /dd /n /i] pushVariables
+  [
+    /vv arg1 def
+    vv isArray
+    { } { [vv to_records pop] /vv set } ifelse
+    vv {toString} map /vv set
+    vv { /tt set [@@@.Dsymbol tt] cat } map /dd set
+    % Starting the checks. 
+    0 1 vv length 1 sub {
+       /i set
+       vv i get . dd i get . mul /tt set
+       tt @@@.hsymbol . add init tt eq { }
+       { [@@@.hsymbol ( is larger than ) vv i get ( ) dd i get] cat error} ifelse
+    } for
+
+    0 1 vv length 1 sub {
+       /i set
+       vv i get . /tt set
+       tt (1). add init (1). eq { }
+       { [vv i get ( is larger than 1 ) ] cat error} ifelse
+    } for
+    /arg1 1 def
+  ] pop
+  popVariables
+  arg1
+} def
+[(ecart.checkOrder)
+ [(v ecart.checkOrder bool checks if the given order is relevant)
+  (for the ecart division.)
+  (cf. ecartd.gb, ecart.gb, ecartn.gb)
+ ]
+] putUsages 
+
+/ecart.wv_last {
+  /arg1 set
+  [/in-ecart.wv_last /vv /tt /dd /n /i] pushVariables
+  [
+    /vv arg1 def
+    vv isArray
+    { } { [vv to_records pop] /vv set } ifelse
+    vv {toString} map /vv set
+    vv { /tt set [@@@.Dsymbol tt] cat } map /dd set
+    vv {  -1 } map
+    dd {   1 } map join /arg1 set 
+  ] pop
+  popVariables
+  arg1
+} def
+[(ecart.wv_last)
+ [(v ecart.wv_last wt )
+  (It returns the weight vector -1,-1,...-1; 1,1, ..., 1)
+  (Use this weight vector as the last weight vector for ecart division)
+  (if ecart.checkOrder complains about the order given.)
+ ]
+] putUsages 
+
 ( ) message-quiet 
+