Changeset 224420b in git

Timestamp:

Feb 8, 2010, 4:57:48 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b4ffba8b9a7046b1dd2251d561bbd258152ad7c8

Parents:

43525f2b3186f312a1677e0ce6e04823dc86a8c1

Message:

removed duplicate proc declarations when doing
LIB "all.lib";
i.e., no more "redefine" prompts

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

Location:

Singular/LIB

Files:

• brnoeth.lib (modified) (3 diffs)
• crypto.lib (modified) (2 diffs)
• gmspoly.lib (modified) (2 diffs)
• realrad.lib (modified) (4 diffs)

Singular/LIB/brnoeth.lib

@@ -508 +508 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-static proc subset (ideal I,ideal J)
+static proc idealSubset (ideal I,ideal J)
 {
   // checks wether I is contained in J and returns a boolean
@@ -530 +530 @@
   if (typeof(P[1])=="ideal")
   {
-    return(subset(I,P[1]));
+    return(idealSubset(I,P[1]));
   }
   else
@@ -543 +543 @@
   // remark : I and J are assumed to be given by a standard basis
   int answer=0;
-  if (subset(I,J)==1)
-  {
-    if (subset(J,I)==1)
+  if (idealSubset(I,J)==1)
+  {
+    if (idealSubset(J,I)==1)
     {
       answer=1;

Singular/LIB/crypto.lib

@@ -2077 +2077 @@
 }
 
-proc decode(string g)
-"USAGE:  decode(s); s a string
+proc decodeString(string g)
+"USAGE:  decodeString(s); s a string
 ASSUME:  s is a string of a number, the output of code
 COMPUTE: a string, RSA-decoding of the string s
 RETURN:  return RSA-decoding of the string s as string
-EXAMPLE: decode;  shows an example
+EXAMPLE: decodeString;  shows an example
 "
 {
@@ -2104 +2104 @@
   string
 s="78638618599886548153321853785991541374544958648147340831959482696082179852616053583234149080198937632782579537867262780982185252913122030800897193851413140758915381848932565";
-  string t=decode(s);
+  string t=decodeString(s);
   t;
 }

Singular/LIB/gmspoly.lib

@@ -138 +138 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-static proc vfilt(matrix B,int d)
+static proc vfiltTuple(matrix B,int d)
 {
   int mu=ncols(B);
@@ -527 +527 @@
     setring(@S);
 
-    e0,s0,V,B=vfilt(imap(@XS,A),d);
+    e0,s0,V,B=vfiltTuple(imap(@XS,A),d);
     a,e0,e,s,V,B,G=spec(e0,s0,V,B);
 

Singular/LIB/realrad.lib

@@ -68 +68 @@
   }
   //sub are the subsets of {x_1,...,x_n}
-  sub=subset(n);
+  sub=subsets(n);
   siz=size(sub)-1;//we dont want to localize on all variables
 
@@ -582 +582 @@
    p=subst(p,@t,0);
    p=realpoly(p);
-   @s=subset(n-1);
+   @s=subsets(n-1);
    ideal jacs;
    for (@z=1;@z<=size(@s);@z++)
@@ -1075 +1075 @@
 }
 
-static proc subset(int n)
-"USAGE :subset(n); n>=0 in Z
+static proc subsets(int n)
+"USAGE :subsets(n); n>=0 in Z
 RETURN :l a list of all non-empty subsets of {1,..,n}
-EXAMPLE:subset(n) shows an example;
+EXAMPLE:subsets(n) shows an example;
 "
 {
@@ -1106 +1106 @@
 example
 { "EXAMPLE:"; echo = 2;
-  subset(3);
-  subset(4);
+  subsets(3);
+  subsets(4);
 }