Changeset 9ea76a in git for Singular/LIB/qhmoduli.lib

Timestamp:

Apr 14, 2009, 1:51:43 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2c3a5db391a25c28449b80c5f27e1dd77ed2c30f

Parents:

635e4e877aa071bdb73967ac97deb8370b135487

Message:

bug fix: ContainedQ --> containedQ prior to release 3-1-0


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

File:

• Singular/LIB/qhmoduli.lib (modified) (5 diffs)

Singular/LIB/qhmoduli.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: qhmoduli.lib,v 1.15 2009-04-14 08:36:17 Singular Exp $";
+version="$Id: qhmoduli.lib,v 1.16 2009-04-14 11:51:43 seelisch Exp $";
 category="Singularities";
 info="
@@ -1165 +1165 @@
   mma = Max(wt);
 
+<<<<<<< qhmoduli.lib
+  for(i = mi; i <= ma; i = i + 1) {
+    if(containedQ(wt, i)) {    // find variables of weight i
+=======
   for(ii = mmi; ii <= mma; ii++)
   {
-    if(ContainedQ(wt, ii))
+    if(containedQ(wt, ii))
     {    // find variables of weight ii
+>>>>>>> 1.15
       k = 0;
       index = 0;
@@ -1209 +1214 @@
     }
   }
+  "type of i:", typeof(i);
   combList[1] = linearSubs;
   combList[2] = nonlinearSubs;
@@ -1363 +1369 @@
       {
         newP = temp + decP[j];        // new partition
-        if(!ContainedQ(parts, newP, 1))
+<<<<<<< qhmoduli.lib
+        if(!containedQ(parts, newP, 1)) {
+=======
+        if(!containedQ(parts, newP, 1))
         {
+>>>>>>> 1.15
           k = k + 1;
           parts[k] = newP;
@@ -1441 +1451 @@
   c = 1;
 
+<<<<<<< qhmoduli.lib
+  for(int i = 1; i <= size(l1); i = i + 1) {
+    b = containedQ(l2, l1[i]);
+    if(b == 1) {
+=======
   for(int i = 1; i <= size(l1); i++)
   {
-    b = ContainedQ(l2, l1[i]);
+    b = containedQ(l2, l1[i]);
     if(b == 1)
     {
+>>>>>>> 1.15
       l[c] = l1[i];
       c++;