Changeset 5116a21 in git

Timestamp:

Dec 12, 2011, 6:55:33 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ae3ad6cdf6204f707110d832cded7d76f5258ed2

Parents:

c360967d0dc4ef57f8ba249d247ddcd773bbba4d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 18:55:33+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 19:09:38+01:00

Message:

test syzygy and all kinds of resolutions via make check

ADD: test syz + sres/lres/nres/mres on the kernel level!
ADD: print syStrategy
ADD: get length + Betti numbers
ADD: minimize resolutions

TODO: conversion to list of ideals?

File:

• kernel/test.cc (modified) (1 diff)

kernel/test.cc

@@ -396 +396 @@
   rChangeCurrRing(R);
 
-  ideal G = kStd(I, currQuotient, testHomog, NULL);
+  {
+    ideal G = kStd(I, currQuotient, testHomog, NULL);
 
 #ifdef PDEBUG
-  PrintS("GB: ");
-  idShow(G, R, R, 0);
+    PrintS("GB: ");
+    idShow(G, R, R, 0);
 #endif
 
-  idDelete( &G, R);
-
-  ideal SYZ;
-
-  {
-    intvec *ww=NULL;
-    SYZ = idSyzygies(I, testHomog, &ww);
-    if (ww!=NULL) delete ww;
-  }
-
-
+    idDelete( &G, R);
+  }
+
+  {
+    intvec *weights = NULL;
+    ideal SYZ = idSyzygies(I, testHomog, &weights);
+    
 #ifdef PDEBUG
-  PrintS("SYZ: ");
-  idShow(SYZ, R, R, 0);
+    PrintS("SYZ: ");
+    idShow(SYZ, R, R, 0);
 #endif
-  
-  idDelete( &SYZ, R);
-  idDelete( &I, R);
-
+
+    idDelete(&SYZ, R);
+    if (weights!=NULL) { PrintS("weights: "); weights->show(); delete weights; }
+  }
+
+
+  {
+    PrintS("\n**********************************\n");
+    PrintS("lres: \n");
+    int dummy;
+    syStrategy r = syLaScala3(I,&dummy);
+
+    intvec *b = syBettiOfComputation(r, FALSE);
+    PrintS("non-min. betti: \n");    b->show();    PrintLn();
+    delete b;
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    r =  syMinimize(r); // syzstr->references ++ ==> memory leak :(((
+
+    b = syBettiOfComputation(r, TRUE);
+    PrintS("min. betti: \n");    b->show();    PrintLn();
+    delete b;    
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+    
+    syKillComputation(r, R);
+  }
+
+  {
+    PrintS("\n**********************************\n");
+    PrintS("sres: \n");
+    const int maxl = rVar(R)-1; // +2*(1);
+
+    syStrategy r = sySchreyer(I, rVar(R));
+
+    intvec *b = syBettiOfComputation(r, FALSE);
+    PrintS("non-min. betti: \n");    b->show();    PrintLn();
+    delete b;
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    r =  syMinimize(r); // syzstr->references ++ ==> memory leak :(((
+
+    b = syBettiOfComputation(r, TRUE);
+    PrintS("min. betti: \n");    b->show();    PrintLn();
+    delete b;    
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    syKillComputation(r, R);
+  }
+
+    
+
+  {
+    PrintS("\n**********************************\n");
+    PrintS("nres: \n");
+    intvec *weights=NULL;
+//    const int maxl = rVar(R)-1 + 2*(1);
+    syStrategy r = syResolution(I, rVar(R)-1, weights, FALSE/*iiOp==MRES_CMD*/);
+
+    intvec *b = syBettiOfComputation(r, FALSE);
+    PrintS("non-min. betti: \n");    b->show();    PrintLn();
+    delete b;
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    r =  syMinimize(r); // syzstr->references ++ ==> memory leak :(((
+
+    b = syBettiOfComputation(r, TRUE);
+    PrintS("min. betti: \n");    b->show();    PrintLn();
+    delete b;    
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    syKillComputation(r, R);
+  }
+  
+
+  {
+    PrintS("\n**********************************\n");
+    PrintS("mres: \n");
+    intvec *weights=NULL;
+//    const int maxl = rVar(R)-1 + 2*(1);
+    syStrategy r = syResolution(I, rVar(R)+1, weights, TRUE/*iiOp==MRES_CMD*/);
+
+    intvec *b = syBettiOfComputation(r, FALSE);
+    PrintS("non-min. betti: \n");    b->show();    PrintLn();
+    delete b;
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    r =  syMinimize(r); // syzstr->references ++ ==> memory leak :(((
+
+    b = syBettiOfComputation(r, TRUE);
+    PrintS("min. betti: \n");    b->show();    PrintLn();
+    delete b;    
+
+    Print("length: %d\n", sySize(r));
+
+    syPrint(r, "R");
+
+    syKillComputation(r, R);
+  }
+  
+
+
+  
+  idDelete( &I, R);  
   rDelete(R); // should cleanup every belonging polynomial, right!?