Changeset 2499bf in git

Timestamp:

Oct 15, 2003, 7:07:24 PM (21 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d07137421b096501262d8c5a4e9f38bec9f15441

Parents:

35aab3657393a3d870690b1cf2533f274e1c31f0

Message:

*levandov: janet with adjustments for plural and criteria


git-svn-id: file:///usr/local/Singular/svn/trunk@6894 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (2 diffs)
• extra.cc (modified) (3 diffs)
• janet.cc (added)
• janet.h (added)
• wrapper.cc (added)

Singular/Makefile.in

@@ -111 +111 @@
     ring.cc shortfl.cc silink.cc kspoly.cc \
     subexpr.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc\
-    timer.cc weight.cc \
+    timer.cc weight.cc janet.cc wrapper.cc\
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
     libparse.cc mod_raw.cc sing_win.cc\
@@ -172 +172 @@
         fglm.h kstd1.h modulop.h sing_dbm.h weight.h \
         fglmgauss.h fglmvec.h mpsr.h mpsr_sl.h\
-        kstdfac.h mpsr_Get.h kmatrix.h\
+        kstdfac.h mpsr_Get.h kmatrix.h janet.h\
         kutil.h mpsr_Put.h\
         ndbm.h dbm_sl.h polys-impl.h libparse.h \

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.199 2003-07-25 13:37:02 levandov Exp $ */
+/* $Id: extra.cc,v 1.200 2003-10-15 17:07:24 levandov Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -136 +136 @@
 static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h);
 #endif
+
+extern BOOLEAN jjJanetBasis(leftv res, leftv v);
 
 
@@ -588 +590 @@
        "Olaf Bachmann, Hubert Grassmann, Kai Krueger, Wolfgang Neumann, Thomas Nuessler, Wilfred Pohl, Jens Schmidt, Mathias Schulze, Thomas Siebert, Ruediger Stobbe, Moritz Wenk, Tim Wichmann");
      return FALSE;
+   }
+   else
+/*==================== janet =============================*/
+ if(strcmp(sys_cmd,"janet") == 0)
+   {
+     if ((h!=NULL) && ((h->Typ() == IDEAL_CMD) || (h->Typ()== MODUL_CMD)))
+     {
+        return jjJanetBasis(res,h);
+     }
+     else
+     {
+      WerrorS("ideal expected");
+      return TRUE;
+     }
    }
    else