===================================================================
RCS file: /home/cvs/OpenXM/src/k097/lib/minimal/minimal.k,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- OpenXM/src/k097/lib/minimal/minimal.k	2000/06/09 08:04:54	1.14
+++ OpenXM/src/k097/lib/minimal/minimal.k	2000/06/15 07:38:36	1.16
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/k097/lib/minimal/minimal.k,v 1.13 2000/06/08 08:37:53 takayama Exp $ */
+/* $OpenXM: OpenXM/src/k097/lib/minimal/minimal.k,v 1.15 2000/06/14 07:44:05 takayama Exp $ */
 #define DEBUG 1 
 /* #define ORDINARY 1 */
 /* If you run this program on openxm version 1.1.2 (FreeBSD),
@@ -137,9 +137,20 @@ sm1(" [(AvoidTheSameRing)] pushEnv 
 
 def SresolutionFrameWithTower(g,opt) {
   local gbTower, ans, ff, count, startingGB, opts, skelton,withSkel, autof,
-        gbasis;
+        gbasis, nohomog;
+  nohomog = false;
+  count = -1;
   if (Length(Arglist) >= 2) {
-    if (IsInteger(opt)) count = opt;
+    if (IsInteger(opt)) {
+      count = opt;
+    }else if (IsString(opt)) {
+      if (opt == "homogenized") {
+         nohomog = true;
+      }else{
+         Println("Warning: unknown option");
+         Println(opt);
+      }
+    }
   }else{
     count = -1;
   }
@@ -153,7 +164,12 @@ def SresolutionFrameWithTower(g,opt) {
   */
 
   sm1(" (mmLarger) (matrix) switch_function ");
-  g = Map(g,"Shomogenize");
+  if (! nohomog) {
+    Println("Automatic homogenization.");
+    g = Map(g,"Shomogenize");
+  }else{
+    Println("No automatic homogenization.");
+  }
   if (SonAutoReduce) {
     sm1("[ (AutoReduce) ] system_variable /autof set ");
     sm1("[ (AutoReduce) 1 ] system_variable ");
@@ -193,12 +209,13 @@ def SresolutionFrameWithTower(g,opt) {
 }
 HelpAdd(["SresolutionFrameWithTower",
 ["It returs [resolution of the initial, gbTower, skelton, gbasis]",
+ "option: \"homogenized\" (no automatic homogenization) ",
  "Example: Sweyl(\"x,y\");",
  "         a=SresolutionFrameWithTower([x^3,x*y,y^3-1]);"]]);
 
 def SresolutionFrame(f,opt) {
   local ans;
-  ans = SresolutionFrameWithTower(f);
+  ans = SresolutionFrameWithTower(f,opt);
   return(ans[0]);
 }
 /* ---------------------------- */
@@ -363,6 +380,10 @@ def Sdegree(f,tower,level) {
 
 def SgenerateTable(tower) {
   local height, n,i,j, ans, ans_at_each_floor;
+
+  /*
+  Print("SgenerateTable: tower=");Println(tower);  
+  sm1(" print_switch_status "); */
   height = Length(tower);
   ans = NewArray(height);
   for (i=0; i<height; i++) {
@@ -438,7 +459,7 @@ def SmaxOfStrategy(a) {
 }  
 
 
-def SlaScala(g) {
+def SlaScala(g,opt) {
   local rf, tower, reductionTable, skel, redundantTable, bases,
         strategy, maxOfStrategy, height, level, n, i,
         freeRes,place, f, reducer,pos, redundant_seq,bettiTable,freeResV,ww,
@@ -447,11 +468,17 @@ def SlaScala(g) {
   /* extern WeightOfSweyl; */
   ww = WeightOfSweyl;
   Print("WeightOfSweyl="); Println(WeightOfSweyl);
-  rf = SresolutionFrameWithTower(g);
+  rf = SresolutionFrameWithTower(g,opt);
   Print("rf="); sm1_pmat(rf);
   redundant_seq = 1;   redundant_seq_ordinary = 1;
   tower = rf[1];
+
+  Println("Generating reduction table which gives an order of reduction.");
+  Print("WeghtOfSweyl="); Println(WeightOfSweyl);
+  Print("tower"); Println(tower);
   reductionTable = SgenerateTable(tower);
+  Print("reductionTable="); sm1_pmat(reductionTable);
+
   skel = rf[2];
   redundantTable = SnewArrayOfFormat(rf[1]);
   redundantTable_ordinary = SnewArrayOfFormat(rf[1]);
@@ -472,7 +499,7 @@ def SlaScala(g) {
         Println([level,i]);
         reductionTable_tmp[i] = -200000;
         if (reductionTable[level,i] == strategy) {
-           Print("Processing "); Print([level,i]);
+           Print("Processing [level,i]= "); Print([level,i]);
            Print("   Strategy = "); Println(strategy);
            if (level == 0) {
              if (IsNull(redundantTable[level,i])) {
@@ -862,6 +889,7 @@ def Sbases_to_vec(bases,size) {
 
 HelpAdd(["Sminimal",
 ["It constructs the V-minimal free resolution by LaScala-Stillman's algorithm",
+ "option: \"homogenized\" (no automatic homogenization ",
  "Example:  Sweyl(\"x,y\",[[\"x\",-1,\"y\",-1,\"Dx\",1,\"Dy\",1]]);", 
  "          v=[[2*x*Dx + 3*y*Dy+6, 0],",
  "             [3*x^2*Dy + 2*y*Dx, 0],",
@@ -873,12 +901,17 @@ HelpAdd(["Sminimal",
  "         IsExact_h(b,[x,y]):",
  "Note:  a[0] is the V-minimal resolution. a[3] is the Schreyer resolution."]]);
 
-def Sminimal(g) {
+def Sminimal(g,opt) {
   local r, freeRes, redundantTable, reducer, maxLevel,
         minRes, seq, maxSeq, level, betti, q, bases, dr,
         betti_levelplus, newbases, i, j,qq, tminRes;
-  r = SlaScala(g);
+  if (Length(Arglist) < 2) {
+     opt = null;
+  }
+  ScheckIfSchreyer("Sminimal:0");
+  r = SlaScala(g,opt);
   /* Should I turn off the tower?? */
+  ScheckIfSchreyer("Sminimal:1");
   freeRes = r[0];
   redundantTable = r[1];
   reducer = r[2];
@@ -1167,6 +1200,10 @@ def Sschreyer(g) {
   rf = SresolutionFrameWithTower(g);
   redundant_seq = 1;   redundant_seq_ordinary = 1;
   tower = rf[1];
+  Println("Generating reduction table which gives an order of reduction.");
+  Println("But, you are in Sschreyer...., you may not use LaScala-Stillman");
+  Print("WeghtOfSweyl="); Println(WeightOfSweyl);
+  Print("tower"); Println(tower);
   reductionTable = SgenerateTable(tower);
   skel = rf[2];
   redundantTable = SnewArrayOfFormat(rf[1]);
@@ -1730,3 +1767,26 @@ HelpAdd(["ReParse",
  "In this case, ReParse the outputs from these functions.",
  "cf. IsExaxt_h"
 ]]);
+
+def ScheckIfSchreyer(s) {
+  local ss;
+  sm1(" (report) (grade) switch_function /ss set ");
+  if (ss != "module1v") {
+     Print("ScheckIfSchreyer: from "); Println(s);
+     Error("grade is not module1v");
+  }
+  /*
+  sm1(" (report) (mmLarger) switch_function /ss set ");
+  if (ss != "tower") {
+     Print("ScheckIfSchreyer: from "); Println(s);
+     Error("mmLarger is not tower");
+  }
+  */
+  sm1(" [(Schreyer)] system_variable (universalNumber) dc /ss set ");
+  if (ss != 1) {
+     Print("ScheckIfSchreyer: from "); Println(s);
+     Error("Schreyer order is not set.");
+  }
+  /* More check will be necessary. */
+  return(true);
+}
\ No newline at end of file