Changeset a3432c in git

Timestamp:

Sep 24, 1998, 2:09:26 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2386d98357886538fbc1e8f5e3e458fcb811ff1f

Parents:

56c52a7879fbc6de62cefba1da86b2edf2aadd4c

Message:

minor optimizations


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

Location:

Singular

Files:

• LIB/primdec.lib (modified) (8 diffs)
• subexpr.cc (modified) (17 diffs)

Singular/LIB/primdec.lib

@@ -1 @@
-// $Id: primdec.lib,v 1.26 1998-09-24 09:59:51 Singular Exp $
+// $Id: primdec.lib,v 1.27 1998-09-24 12:09:26 Singular Exp $
 ////////////////////////////////////////////////////////////////////////////////
 // primdec.lib                                                                //
@@ -11 +11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-version="$Id: primdec.lib,v 1.26 1998-09-24 09:59:51 Singular Exp $";
+version="$Id: primdec.lib,v 1.27 1998-09-24 12:09:26 Singular Exp $";
 info="
 LIBRARY: primdec.lib: PROCEDURE FOR PRIMARY DECOMPOSITION
@@ -383 +383 @@
    if(size(k1)==size(k2))
    {
-      for(j=size(k1);j>0;j--)
+      for(j=ncols(k1);j>0;j--)
       {
          if(leadexp(k1[j])!=leadexp(k2[j]))
@@ -401 +401 @@
    if(size(k1)==size(k2))
    {
-      for(j=size(k1);j>0;j--)
+      for(j=ncols(k1);j>0;j--)
       {
          if(leadexp(k1[j])!=leadexp(k2[j]))
@@ -431 +431 @@
 
   ideal i=maxideal(1);
-  int k=size(i);
+  int k=ncols(i);
   i[k]=0;
-  i=randomid(i,size(i),b);
+  i=randomid(i,ncols(i),b);
   ideal ires=maxideal(1);
   ires[k]=i[1]+var(k);
@@ -472 +472 @@
       else
       {
-         while (lead(i[m])/var(n-1)==0)
-        {
-            m=m+1;
-         }
-         m=m-1;
+        while (lead(i[m])/var(n-1)==0)
+        {
+          m=m+1;
+        }
+        m=m-1;
       }
       //check whether i[m] =(c*var(n)+h)^e modulo prm for some
@@ -482 +482 @@
       //if not (0) is returned, else var(n)+h is added to prm
 
-         e=deg(lead(i[m]));
-         t=leadcoef(i[m])*e*var(n)+(i[m]-lead(i[m]))/var(n)^(e-1);
-
-         i[m]=poly(e)^e*leadcoef(i[m])^(e-1)*i[m];
-
-         if (reduce(i[m]-t^e,prm,1) !=0)
-         {
-           return(ideal(0));
-         }
-         h=interred(t);
-         t=h[1];
+      e=deg(lead(i[m]));
+      t=leadcoef(i[m])*e*var(n)+(i[m]-lead(i[m]))/var(n)^(e-1);
+
+      i[m]=poly(e)^e*leadcoef(i[m])^(e-1)*i[m];
+
+      if (reduce(i[m]-t^e,prm,1) !=0)
+      {
+        return(ideal(0));
+      }
+      h=interred(t);
+      t=h[1];
 
       prm = prm,t;
@@ -530 +530 @@
          continue;
       }
-
 
       if(size(l[2*i])==0)

Singular/subexpr.cc

@@ -94 +94 @@
     if ((store!=NULL)&&(store!=this))
       store->CleanUp();
-    
+
     switch (t /*=Typ()*/)
       {
@@ -128 +128 @@
         case RESOLUTION_CMD:
           syPrint((syStrategy)d);
-          break;  
+          break;
         case STRING_CMD:
           ::Print("%-*.*s%s",spaces,spaces," ",(char *)d);
@@ -138 +138 @@
          {
            procinfov pi=(procinfov)d;
-           ::Print("%-*.*s// libname  : %s\n",spaces,spaces," ",
-                   piProcinfo(pi, "libname"));
-           ::Print("%-*.*s// procname : %s\n",spaces,spaces," ",
-                   piProcinfo(pi, "procname"));
-           ::Print("%-*.*s// type     : %s",spaces,spaces," ",
-                   piProcinfo(pi, "type"));
-           //      ::Print("%-*.*s// ref      : %s",spaces,spaces," ",
-           //   piProcinfo(pi, "ref"));
-           break;
+           ::Print("%-*.*s// libname  : %s\n",spaces,spaces," ",
+                   piProcinfo(pi, "libname"));
+           ::Print("%-*.*s// procname : %s\n",spaces,spaces," ",
+                   piProcinfo(pi, "procname"));
+           ::Print("%-*.*s// type     : %s",spaces,spaces," ",
+                   piProcinfo(pi, "type"));
+           //           ::Print("%-*.*s// ref      : %s",spaces,spaces," ",
+           //   piProcinfo(pi, "ref"));
+           break;
          }
        case POINTER_CMD:
@@ -213 +213 @@
   {
     PrintLn();
-  }  
+  }
 #ifdef SIQ
   if (rtyp!=COMMAND)
@@ -278 +278 @@
         break;
       case PROC_CMD:
-        piKill((procinfov)data);
-        break;
+        piKill((procinfov)data);
+        break;
       case LINK_CMD:
         slKill((si_link)data);
@@ -313 +313 @@
 #ifdef HAVE_RTIMER
         case VRTIMER:
-#endif          
+#endif
       case VOICE:
       case VMAXDEG:
@@ -327 +327 @@
       default:
         ::Print("CleanUp: unknown type %d\n",rtyp);  /* DEBUG */
-#endif          
+#endif
     } /* end switch: (rtyp) */
     data=NULL;
@@ -349 +349 @@
 #ifdef HAVE_RTIMER
       case VRTIMER:
-#endif          
+#endif
       case VOICE:
       case VMAXDEG:
@@ -515 +515 @@
           r->ref++;
           data=d;
-        }  
+        }
         else
         {
           WerrorS("invalid ring description");
-        }  
+        }
         break;
       }
@@ -546 +546 @@
 void * sleftv::CopyD(int t)
 {
-  if (iiCheckRing(t))
-     return NULL;
   if ((rtyp!=IDHDL)&&(e==NULL))
   {
+    if (iiCheckRing(t)) return NULL;
     void *x=data;
     if (rtyp==VNOETHER) x=(void *)pCopy(ppNoether);
@@ -559 +558 @@
     return x;
   }
-  void *d=Data();
-  if (!errorreported) return slInternalCopy(this,t,d,e);
+  void *d=Data(); // will also do a iiCheckRing
+  if ((!errorreported) && (d!=NULL)) return slInternalCopy(this,t,d,e);
   return NULL;
 }
@@ -581 +580 @@
   if ((a!=NULL) && (*a!=NULL))
     return (*a)->Copy();
-  return NULL;  
+  return NULL;
 }
 
@@ -664 +663 @@
       {
         return rString((ring)d);
-      }  
+      }
       default:
         #ifdef TEST
@@ -694 +693 @@
 #ifdef HAVE_RTIMER
       case VRTIMER:
-#endif          
+#endif
       case VOICE:
       case VMAXDEG:
@@ -702 +701 @@
         return INT_CMD;
       case LIB_CMD:
-        return STRING_CMD;  
+        return STRING_CMD;
       case VMINPOLY:
         return NUMBER_CMD;
@@ -791 +790 @@
 void * sleftv::Data()
 {
-  if (iiCheckRing(rtyp))
+  if (rtyp!=IDHDL && iiCheckRing(rtyp))
      return NULL;
   if (e==NULL)
@@ -823 +822 @@
                          if(h==NULL) return (void *)sNoName;
                          return IDSTRING(h);
-                       }  
+                       }
       case IDHDL:
         return IDDATA((idhdl)data);