Changeset 0d47ce in git

Timestamp:

Jul 3, 2019, 5:08:16 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

427a52f6ad87c09fcb69f2daedc7c3fc5f7aaad0

Parents:

d90ef21a873dee180216d6118489cf22ec4cdcc3

Message:

fix: multiple definition of subset

Location:

Singular/dyn_modules

Files:

• gitfan/gitfan.cc (modified) (1 diff)
• subsets/subsets.cc (modified) (4 diffs)

Singular/dyn_modules/gitfan/gitfan.cc

@@ -547 +547 @@
 
 
-void subset(std::vector<int> &arr, int size, int left, int index, std::vector<int> &l, std::vector<std::vector<int> > &L)
-{
-  if(left==0)
-  {
-    L.push_back(l);
-    return;
-  }
-
-  for(int i=index; i<size;i++)
-  {
-    l.push_back(arr[i]);
-    subset(arr,size,left-1,i+1,l,L);
-    l.pop_back();
-  }
-}
-
 extern "C" int SI_MOD_INIT(gitfan) (SModulFunctions* p)
 {

Singular/dyn_modules/subsets/subsets.cc

@@ -3 +3 @@
 #include <vector>
 
-void subset(std::vector<int> &arr, int size, int left, int index, std::vector<int> &l, std::vector<std::vector<int> > &L)
+static void s_subset(std::vector<int> &arr, int size, int left, int index, std::vector<int> &l, std::vector<std::vector<int> > &L)
 {
   if(left==0)
@@ -14 +14 @@
   {
     l.push_back(arr[i]);
-    subset(arr,size,left-1,i+1,l,L);
+    s_subset(arr,size,left-1,i+1,l,L);
     l.pop_back();
   }
@@ -24 +24 @@
 // NOTE:    the lists will be sorted lexicographically
 //          and the elements in each of the lists are sorted naturally
-BOOLEAN subsets(leftv res, leftv args)
+static BOOLEAN subsets(leftv res, leftv args)
 {
   leftv u = args;
@@ -39 +39 @@
       std::vector<int> ltemp;
       std::vector<std::vector<int> > lt;
-      subset(array,n,k,0,ltemp,lt);
+      s_subset(array,n,k,0,ltemp,lt);
 
       lists Lt = (lists) omAllocBin(slists_bin);