===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ox.sm1,v
retrieving revision 1.36
retrieving revision 1.42
diff -u -p -r1.36 -r1.42
--- OpenXM/src/kan96xx/Doc/ox.sm1	2004/03/01 07:19:44	1.36
+++ OpenXM/src/kan96xx/Doc/ox.sm1	2004/09/10 13:20:22	1.42
@@ -1,4 +1,4 @@
-%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox.sm1,v 1.35 2004/02/28 13:39:42 takayama Exp $
+%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox.sm1,v 1.41 2004/08/28 05:23:55 takayama Exp $
 
 /ox.sm1.myname (ox-new.sm1) def
 
@@ -77,6 +77,7 @@ ox.version [(Version)] system_variable gt 
 /SM_dupErrors 276  def
 
 /SM_pushCMOtag 277 def
+/SM_executeFunctionWithOptionalArgument 282 def
 
 /SM_control_kill 1024 def
 /SM_control_reset_connection  1030 def
@@ -90,6 +91,7 @@ ox.version [(Version)] system_variable gt 
  (Example: oxsm1.ccc [1 2 3] oxpushcmo oxsm1.ccc oxpopcmo /ff set  ff :: ) 
  (  )
  (client ss oxexecutestring(oxsubmit) <<executeString>>, client ss oxexec <<executeFunction>>) 
+ (client ss oxexecWithOpt )
  
  (Example: oxsm1.ccc (0 1 10 { pop $Hello$ message } for) oxexecutestring ) 
  (Example: oxsm1.ccc (2).. oxpushcmo oxsm1.ccc (10).. oxpushcmo )
@@ -259,6 +261,23 @@ ox.verbose { oxhelp } {  } ifelse
    } {  } ifelse
   [(oxReq) arg2 SM_executeFunction arg1] extension pop
 } def
+/oxexecWithOpt {
+  /arg1 set
+  /arg2 set
+   ox.takelog { ox.log [(oxSerial)] extension ox.mod arg1 put
+                ox.log [(oxSerial)] extension 1 add ox.mod 
+               (executeFunctionWithOptionalArgument) put
+   } {  } ifelse
+  [(oxReq) arg2 SM_executeFunctionWithOptionalArgument arg1] extension pop
+} def
+[(oxexecWithOpt)
+ [
+  $Example: $
+  $oxsm1.ccc (/foo { message message message } def) oxsubmit ;$
+  $oxsm1.ccc (hello) oxpushcmo oxsm1.ccc 1 oxpushcmo oxsm1.ccc [[(opt) 0]] oxpushcmo ;$
+  $oxsm1.ccc (foo) oxexecWithOpt $
+ ]
+] putUsages
 /oxsubmit2 {
   oxexec
 } def
@@ -850,10 +869,11 @@ oxasir.verbose {
   (If you interrupted the computation by typing ctrl-C, type in )
   (   oxasir.ccc oxreset  ; )
   (to interrupt the ox_asir server.)
+  (NOTE: all asir-args must belong to the same ring. cf.oxasir.changeRing. )
   (Example: oxasir.ccc [(fctr) (x^10-1).] asir )
   (  )
   (This function requires plugins cmo, socket and ox_asir server. cf. oxasir)
-  (See, ftp://endeavor.fujitsu.co.jp/pub/isis/asir on asir)
+  (See, http://www.math.kobe-u.ac.jp/Asir on asir)
  ]
 ] putUsages
 
@@ -902,16 +922,27 @@ oxasir.verbose {
 %%% Mathematical functions for asir
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 /oxasir.changeRing {
+  /oxasir.changeRing.rr.prev 0 def
+  oxasir.changeRing2
+} def
+/oxasir.changeRing2 {
   /arg1 set
-  [/in-oxasir.changeRing /f /rr] pushVariables
+  [/in-oxasir.changeRing2 /f /rr ] pushVariables
   [
      /f arg1 def
      f isArray {
-       f {oxasir.changeRing} map 
+       f {oxasir.changeRing2} map 
      }{
        f isPolynomial {
          f (0). eq { } 
-         { f (ring) dc /rr set [(CurrentRingp) rr] system_variable } ifelse
+         { f (ring) dc /rr set [(CurrentRingp) rr] system_variable 
+           oxasir.changeRing.rr.prev tag 1 eq { }
+           {    
+              oxasir.changeRing.rr.prev rr eq  {  } 
+              {  (asir : arguments must belong to the same ring.) error } ifelse
+           } ifelse
+           /oxasir.changeRing.rr.prev rr def
+         } ifelse
        } {  } ifelse
      } ifelse
   ] pop
@@ -1022,7 +1053,7 @@ oxasir.verbose {
 
     f 0 get isPolynomial {
       /r f 0 get (ring) dc def
-      /vvv vvv { r ,, } map def
+      /vvv vvv { r __ } map def
     }
     {
       [vvv from_records ring_of_polynomials 0] define_ring
@@ -1064,6 +1095,137 @@ oxasir.verbose {
   arg1
 } def
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/polygcd {
+  /arg1 set
+  [/pp /f /g /comm /vv] pushVariables
+  [(CurrentRingp)] pushEnv
+  [
+    /pp arg1 def
+    oxasir.ccc [ ] eq {
+       (Starting ox_asir server.) message
+        ox_asirConnectMethod
+    } {  } ifelse
+
+    pp isArray {
+      /f pp 0 get def
+      /g pp 1 get def 
+      pp length 3 eq {
+        /vv pp 2 get def
+        vv isArray { /vv vv from_records  def } {  } ifelse
+        [vv ring_of_polynomials 0] define_ring
+        f . /f set
+        g . /g set
+      } { } ifelse
+    }{ (usage: [f g] polygcd) error } ifelse
+    oxasir.ccc [(gcd) f g] asir /arg1 set
+  ] pop
+  popEnv
+  popVariables
+  arg1
+} def
+[(polygcd)
+ [( [f g] polygcd r )
+  ( [f g v] polygcd r)
+  (Example: [(x^2-1) (x-1) [(x)]] polygcd )
+ ]
+] putUsages
+/polylcm {
+  /arg1 set
+  [/pp /f /g /comm /vv] pushVariables
+  [(CurrentRingp)] pushEnv
+  [
+    /pp arg1 def
+    oxasir.ccc [ ] eq {
+       (Starting ox_asir server.) message
+        ox_asirConnectMethod
+    } {  } ifelse
+
+    pp isArray {
+      /f pp 0 get def
+      /g pp 1 get def 
+      pp length 3 eq {
+        /vv pp 2 get def
+        vv isArray { /vv vv from_records  def } {  } ifelse
+        [vv ring_of_polynomials 0] define_ring
+        f . /f set
+        g . /g set
+      } { } ifelse
+    }{ (usage: [f g] polylcm) error } ifelse
+    oxasir.ccc [(lcm) f g] asir /arg1 set
+  ] pop
+  popEnv
+  popVariables
+  arg1
+} def
+[(polylcm)
+ [( [f g] polylcm r )
+  ( [f g v] polylcm r)
+  (Example: [(x^2-1) (x-1) [(x)]] polylcm )
+ ]
+] putUsages
+
+/asir_red {
+  /arg1 set
+  [/pp /f /g /rr /vv] pushVariables
+  [(CurrentRingp)] pushEnv
+  [
+    /pp arg1 def
+    oxasir.ccc [ ] eq {
+       (Starting ox_asir server.) message
+        ox_asirConnectMethod
+    } {  } ifelse
+    {
+     pp isRational {
+      /f pp numerator def
+      /g pp denominator def
+      [[f g]] reduceByAsir /rr set
+     }{ } ifelse
+     exit
+
+     pp isArray {
+       /vv pp 2 get def
+       /f pp 0 get 0 get def
+       /g pp 0 get 1 get def
+       [[f toString g toString] vv] reduceByAsir /rr set
+     } {  } ifelse
+     exit
+
+     (asir_red: not implemented) error exit
+    } loop
+
+    rr 1 get isPolynomial {
+      rr 0 get rr 1 get div /rr set
+    }{ 
+      rr 1 get (1).. eq {
+         rr 0 get /rr set
+      }{
+         rr 0 get rr 1 get div /rr set
+      } ifelse
+    } ifelse
+
+    /arg1 rr def
+  ] pop
+  popEnv
+  popVariables
+  arg1
+} def
+[(asir_red)
+ [(Calling the function red of asir. It simplifies a rational function.)
+  (cf. cancel)
+  (Example:  (x^2). (x). div asir_red )
+]] putUsages
+
+/asir_fctr { fctr } def
+[(asir_fctr)
+ [(Calling the factorizer of asir.)
+]] putUsages
+
+/asir_primadec { primadec } def
+[(asir_primadec)
+ [(Calling the primadec of asir.)
+]] putUsages
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 [(chattr) 0 /findIntegralRoots] extension pop
 /findIntegralRoots {
@@ -1497,7 +1659,7 @@ oxasir.verbose {
      [wvec] weight_vector
     0] define_ring
 
-    ff { . dehomogenize homogenize } map /ff set
+    ff { toString . dehomogenize homogenize } map /ff set
     vvx { . } map /vvx set %%ex  [x,y] 
     vvd { . } map /vvd set %%ex  [Dx,Dy]
     vvx vvd join [(h).] join /avv set
@@ -1613,3 +1775,7 @@ oxasir.verbose {
 } def
 /@@@polymake.k0.ccc [ ] def
 
+/ox_server_mode {
+  /:: {   } def  % do nothing
+
+} def
\ No newline at end of file