Changeset 334c21f in git for Singular/LIB/qhmoduli.lib

Timestamp:

Apr 14, 2009, 2:08:36 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

797d4f19229a77bdf9613bc5ed8a5f46eaebabe4

Parents:

3360fb21d69c352925dd6bc1692b4f0bd0c595c1

Message:

*hannes: syntax fix


git-svn-id: file:///usr/local/Singular/svn/trunk@11696 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.16 2009-04-14 11:51:43 seelisch Exp $";
+version="$Id: qhmoduli.lib,v 1.17 2009-04-14 12:08:36 Singular 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))
     {    // find variables of weight ii
->>>>>>> 1.15
       k = 0;
       index = 0;
@@ -1369 +1364 @@
       {
         newP = temp + decP[j];        // new partition
-<<<<<<< qhmoduli.lib
-        if(!containedQ(parts, newP, 1)) {
-=======
         if(!containedQ(parts, newP, 1))
         {
->>>>>>> 1.15
           k = k + 1;
           parts[k] = newP;
@@ -1451 +1442 @@
   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++)
   {
@@ -1461 +1447 @@
     if(b == 1)
     {
->>>>>>> 1.15
       l[c] = l1[i];
       c++;