Changeset 23ab77 in git

Timestamp:

Oct 8, 2009, 4:39:52 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

1f6c7a1cb42b3480fe6e327a47a342174f605a38

Parents:

549b99bcc1f420029246897c1927cddd9002af2d

Message:

added extra system command for minor code


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

File:

• Singular/extra.cc (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.322 2009-10-08 10:11:57 seelisch Exp $ */
+/* $Id: extra.cc,v 1.323 2009-10-08 14:39:52 seelisch Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -2191 +2191 @@
       }
       else
-      if(strcmp(sys_cmd,"changeVars")==0)
-      {
-        /*
-        The following code changes the N variables names in currRing in
-        the following way: var(i) is replaced by f(i), 1 <= i <= N,
-        where f(j) is j written to the base of 26 with the digit '0'
-        written as 'a', '1' as 'b', ..., '25' as 'z'.
-        E.g. var(1) goes to f(1)='b', ..., var(25) goes to f(25)='z',
-             var(26) goes to f(26)='ba', etc.
-        The purpose of this rewriting is to eliminate indexed variables,
-        as they may cause problems when generating scripts for Magma,
-        Maple, or Macaulay2.
-        */
-        ring newRing = rCopy0(currRing);
-        int varN = newRing->N;
-        char* alphabet = "abcdefghijklmnopqrstuvwxyz";
-        char theName[10];
-        char tempChars[10];
-        int j; int k; int l;
-        for (int i = 1; i <= varN; i++)
-        {
-          k = i;
-          l = 9;
-          j = k % 26;
-          tempChars[l--] = alphabet[j];
-          k = (k - j) / 26;
-          while (k != 0)
+      if(strcmp(sys_cmd,"changeRing")==0)
+      {
+        if ((h->Typ() == INT_CMD) &&
+            (h->next->Typ() == INT_CMD))
+        {
+          const int fc     = (const int)(long)h->Data();
+          const int varN   = (const int)(long)h->next->Data();
           {
-            j = k % 26;
-            tempChars[l--] = alphabet[j];
-            k = (k - j) / 26;
+            /*
+            The following code creates a ring with characteristic fc, order dp and
+            varN variables with the following names: var(j) is j written to the
+            base of 26 with the digit '0' written as 'a', '1' as 'b', ..., and '25'
+            as 'z'.
+            I.e., var(1) has the name 'b', ..., var(25) the name 'z',
+                 var(26) the name 'ba', etc.
+            Afterwards, the new ring will become the current ring.
+            The purpose of this rewriting is to eliminate indexed variables,
+            as they may cause problems when generating scripts for Magma,
+            Maple, or Macaulay2.
+            */
+            ring newRing = (ring) omAlloc0Bin(sip_sring_bin);
+            newRing->ch = fc;
+            newRing->N = varN;
+            newRing->names = (char **) omAlloc0(varN * sizeof(char_ptr));
+            char* alphabet = "abcdefghijklmnopqrstuvwxyz";
+            char theName[10];
+            char tempChars[10];
+            int j; int k; int l;
+            for (int i = 1; i <= varN; i++)
+            {
+              k = i;
+              l = 9;
+              j = k % 26;
+              tempChars[l--] = alphabet[j];
+              k = (k - j) / 26;
+              while (k != 0)
+              {
+                j = k % 26;
+                tempChars[l--] = alphabet[j];
+                k = (k - j) / 26;
+              }
+              l++;
+              for (j = l; j < 10; j++) theName[j - l] = tempChars[j];
+              theName[10 - l] = '\0';
+              newRing->names[i - 1] = omStrDup(theName);
+            }
+            newRing->wvhdl = (int **)omAlloc0(2 * sizeof(int_ptr));
+            newRing->order = (int *)omAlloc(2* sizeof(int *));
+            newRing->block0 = (int *)omAlloc0(2 * sizeof(int *));
+            newRing->block1 = (int *)omAlloc0(2 * sizeof(int *));
+            newRing->order[0] = ringorder_dp;
+            newRing->block0[0] = 1;
+            newRing->block1[0] = varN;
+            newRing->order[1]  = 0;
+            newRing->OrdSgn    = 1;
+            rComplete(newRing);
+            res->rtyp = RING_CMD;
+            res->data = (void *)newRing;
+            return FALSE;
           }
-          l++;
-          for (j = l; j < 10; j++) theName[j - l] = tempChars[j];
-          theName[10 - l] = '\0';
-          newRing->names[i - 1] = omStrDup(theName);
-        }
-        rComplete(newRing);
-        currRing = newRing;
-        return FALSE;
+        }  
       }
       else