Changeset 99cfcba in git

Timestamp:

Apr 8, 1998, 12:01:58 PM (26 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e3cab3223ca48edb3c313973c3907bd9a256f319

Parents:

33e52153b30e64770ad38770e23349caf3d128fb

Message:

kbase without Werror


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

File:

• Singular/hdegree.cc (modified) (30 diffs)

Singular/hdegree.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hdegree.cc,v 1.11 1998-04-07 18:13:57 Singular Exp $ */
+/* $Id: hdegree.cc,v 1.12 1998-04-08 10:01:58 pohl Exp $ */
 /*
 *  ABSTRACT -  dimension, multiplicity, HC, kbase
@@ -73 +73 @@
   Exponent_t  mc;
   hexist = hInit(S, Q, &hNexist);
-  if (hNexist==0)
+  if (!hNexist)
     return pVariables;
   hwork = (scfmon)Alloc(hNexist * sizeof(scmon));
@@ -79 +79 @@
   hpure = (scmon)Alloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
   mc = hisModule;
-  if (mc==0)
+  if (!mc)
   {
     hrad = hexist;
@@ -90 +90 @@
   loop
   {
-    if (mc!=0)
+    if (mc)
       hComp(hexist, hNexist, mc, hrad, &hNrad);
-    if (hNrad!=0)
+    if (hNrad)
     {
       hNvar = pVariables;
       hRadical(hrad, &hNrad, hNvar);
       hSupp(hrad, hNrad, hvar, &hNvar);
-      if (hNvar!=0)
+      if (hNvar)
       {
         memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
@@ -119 +119 @@
   Free((ADDRESS)hwork, hNexist * sizeof(scmon));
   hDelete(hexist, hNexist);
-  if (hisModule!=0)
+  if (hisModule)
     Free((ADDRESS)hrad, hNexist * sizeof(scmon));
   return pVariables - hCo;
@@ -139 +139 @@
     {
       hCo = dn;
-      for (iv=pVariables; iv>0; iv--)
-      {
-        if (pure[iv]!=0)
+      for (iv=pVariables; iv; iv--)
+      {
+        if (pure[iv])
           hInd[iv] = 0;
         else
           hInd[iv] = 1;
       }
-      if (Nrad!=0)
+      if (Nrad)
       {
         pn = *rad;
@@ -153 +153 @@
         {
           x = var[iv];
-          if (pn[x]!=0)
+          if (pn[x])
           {
             hInd[x] = 0;
@@ -169 +169 @@
   while(pure[var[iv]]) iv--;
   hStepR(rad, Nrad, var, iv, &rad0);
-  if (rad0!=0)
+  if (rad0)
   {
     iv--;
@@ -195 +195 @@
   {
     hCo = Npure + 1;
-    for (x=pVariables; x>0; x--)
-    {
-      if (pure[x]!=0)
+    for (x=pVariables; x; x--)
+    {
+      if (pure[x])
         hInd[x] = 0;
       else
@@ -265 +265 @@
   Free((ADDRESS)hwork, hNexist * sizeof(scmon));
   hDelete(hexist, hNexist);
-  if (hisModule!=0)
+  if (hisModule)
     Free((ADDRESS)hrad, hNexist * sizeof(scmon));
   return Set;
@@ -303 +303 @@
   for (iv=pVariables; iv!=0 ; iv--)
   {
-    if (pure[iv]!=0)
+    if (pure[iv])
       (*Set)[iv-1] = 0;
     else
@@ -331 +331 @@
         {
           x = var[iv];
-          if (pn[x]!=0)
+          if (pn[x])
           {
             pure[x] = 1;
@@ -350 +350 @@
     loop
     {
-      if(pure[var[iv]]==0)
+      if(!pure[var[iv]])
       {
         if(hNotZero(rad, Nrad, var, iv))
@@ -360 +360 @@
       }
       iv--;
-      if (iv==0)
+      if (!iv)
         return;
     }
   }
-  while(pure[var[iv]]!=0) iv--;
+  while(pure[var[iv]]) iv--;
   hStepR(rad, Nrad, var, iv, &rad0);
   iv--;
@@ -486 +486 @@
       for (iv=pVariables; iv; iv--)
       {
-        if (pure[iv]!=0)
+        if (pure[iv])
           (*Set)[iv-1] = 0;
         else
@@ -506 +506 @@
     if (dn > hCo)
     {
-      if (Nrad==0)
+      if (!Nrad)
         hCheckIndep(pure);
       else
       {
         pn = *rad;
-        for (iv = Nvar; iv>0; iv--)
+        for (iv = Nvar; iv; iv--)
         {
           x = var[iv];
-          if (pn[x]!=0)
+          if (pn[x])
           {
             pure[x] = 1;
@@ -526 +526 @@
   }
   iv = Nvar;
-  while(pure[var[iv]]!=0) iv--;
+  while(pure[var[iv]]) iv--;
   hStepR(rad, Nrad, var, iv, &rad0);
   iv--;
@@ -574 +574 @@
   hRadical(hrad, &hNrad, hNvar);
   hSupp(hrad, hNrad, hvar, &hNvar);
-  if (hNvar!=0)
+  if (hNvar)
   {
     hCo = hNvar;
@@ -582 +582 @@
     hDimSolve(hpure, hNpure, hrad, hNrad, hvar, hNvar);
   }
-  if ((hCo!=0) && (hCo < pVariables))
+  if (hCo && (hCo < pVariables))
   {
     hIndMult(hpure, hNpure, hrad, hNrad, hvar, hNvar);
@@ -649 +649 @@
   scmon pn;
   scfmon sn;
-  if (iv==0)
+  if (!iv)
     return pure[var[1]];
-  else if (Nstc==0)
+  else if (!Nstc)
   {
     sum = 1;
-    for (i = Nvar; i>0; i--)
+    for (i = Nvar; i; i--)
       sum *= pure[var[i]];
     return sum;
@@ -695 +695 @@
   for (i = 1; i <= pVariables; i++)
   {
-    if (pure[i]!=0)
+    if (pure[i])
     {
       i0++;
@@ -723 +723 @@
     if (dn == hCo)
     {
-      if (Nrad==0)
+      if (!Nrad)
         hProject(pure, hsel);
       else
       {
         pn = *rad;
-        for (iv = Nvar; iv>0; iv--)
+        for (iv = Nvar; iv; iv--)
         {
           x = var[iv];
-          if (pn[x]!=0)
+          if (pn[x])
           {
             pure[x] = 1;
@@ -750 +750 @@
     loop
     {
-      if(pure[var[iv]]==0)
+      if(!pure[var[iv]])
       {
         if(hNotZero(rad, Nrad, var, iv))
@@ -760 +760 @@
       }
       iv--;
-      if (iv==0)
+      if (!iv)
         return;
     }
@@ -793 +793 @@
   Exponent_t  mc;
   hexist = hInit(S, Q, &hNexist);
-  if (hNexist==0)
+  if (!hNexist)
   {
     hCo = 0;
@@ -806 +806 @@
   mc = hisModule;
   hrad = (scfmon)Alloc(hNexist * sizeof(scmon));
-  if (mc==0)
+  if (!mc)
   {
     memcpy(hrad, hexist, hNexist * sizeof(scmon));
@@ -820 +820 @@
   loop
   {
-    if (mc!=0)
+    if (mc)
     {
       hComp(hexist, hNexist, mc, hrad, &hNrad);
@@ -826 +826 @@
       memcpy(hstc, hrad, hNrad * sizeof(scmon));
     }
-    if (hNrad!=0)
+    if (hNrad)
     {
       hNvar = pVariables;
       hRadical(hrad, &hNrad, hNvar);
       hSupp(hrad, hNrad, hvar, &hNvar);
-      if (hNvar!=0)
+      if (hNvar)
       {
         hCo = hNvar;
@@ -850 +850 @@
       hMu = 0;
     }
-    if ((hNvar!=0) && (hCo == di))
-    {
-      if ((di!=0) && (di < pVariables))
+    if (hNvar && (hCo == di))
+    {
+      if (di && (di < pVariables))
         hDimMult(hpure, hNpure, hrad, hNrad, hvar, hNvar);
-      else if (di==0)
+      else if (!di)
         hMu++;
       else
@@ -1376 +1376 @@
     if (di != 0)
     {
-      Werror("KBase not finite");
-      return idInit(1,1);
+      //Werror("KBase not finite");
+      return idInit(1,s->rank);
     }
   }