Changeset dabe36d in git for Singular/LIB/crypto.lib

Timestamp:

Apr 24, 2015, 10:10:00 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

769a27f375c14dbe7cac70321db6bb76ef18fb07

Parents:

0e64419f9c8b5ac88636e5a328adeece695304d3

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-04-24 10:10:00+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-04-24 11:04:22+02:00

Message:

crypto::is_injective -> set_is_injective (conflict with algebra.lib)

File:

• Singular/LIB/crypto.lib (modified) (6 diffs)

Singular/LIB/crypto.lib

@@ -74 +74 @@
   injective_knapsack(int ksize, int kmaxelement)                        Creates all list of all injective knapsacks of given size ksize and maximal element kmaxelement
   calculate_max_sum(list a)                                  Calculates the maximal sum of a given knapsack a
-  is_injective(list a)                                    Checks if knapsack a is injective
+  set_is_injective(list a)                                    Checks if knapsack a is injective
   is_h_injective(list a, int h)                                Checks if knapsack a is h-injective
   is_fix_injective(list a)                                  Checks if knapsack a is fix-injective
@@ -3360 +3360 @@
   for(i=1;i<=size(list_of_lists);i++)
   {
-    if (is_injective(list_of_lists[i])==1)
+    if (set_is_injective(list_of_lists[i])==1)
     {
       output_list=insert(output_list,list_of_lists[i]);
@@ -3393 +3393 @@
 }
 
-proc is_injective(list a)
-"USAGE:   is_injective(a)
+proc set_is_injective(list a)
+"USAGE:   set_is_injective(a)
 RETURN:  1 if a is injective, 0 otherwise
-EXAMPLE: is_injective; shows an example;
+EXAMPLE: set_is_injective; shows an example;
 "
 {
@@ -3423 +3423 @@
   list inj = 1,5,7,41;
   list non_inj = 1,2,3,4;
-  is_injective(inj);
-  is_injective(non_inj);
+  set_is_injective(inj);
+  set_is_injective(non_inj);
 }
 
@@ -3554 +3554 @@
   int condition = 0;
   out = set_turn(out);
-  if (is_injective(out)==0)
+  if (set_is_injective(out)==0)
   {
     return(0);
@@ -3593 +3593 @@
   list a = three_elements(super_increasing,2);
   a;
-  is_injective(a);
+  set_is_injective(a);
 }
 /*