Changeset 9fe6c3 in git

Timestamp:

Oct 24, 2018, 2:36:24 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

99d02931f1b01b2ae7d88ca405c300918c8c6919

Parents:

e552b7ba49ec3df67c55e5cc36c00cc4783cbda0

Message:

add: subsets(kn,) in subsets.so (all subsets of 1..n with k elements)

Files:

• Singular/LIB/gitfan.lib (modified) (1 diff)
• Singular/dyn_modules/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/gitfan/gitfan.cc (modified) (2 diffs)
• Singular/dyn_modules/subsets/Makefile.am (added)
• Singular/dyn_modules/subsets/subsets.cc (moved) (moved from misc/subsets.cc) (2 diffs)
• configure.ac (modified) (1 diff)
• m4/options.m4 (modified) (3 diffs)
• misc/build_subsets (deleted)

Singular/LIB/gitfan.lib

@@ -84 +84 @@
   LIB "gfanlib.so";
   LIB "gitfan.so";
+  //LIB "subsets.so";
   newstruct("permutation","intvec image");
   system("install","permutation","*",composePermutations,2);

Singular/dyn_modules/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-SUBDIRS=staticdemo bigintm syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order interval cohomo
+SUBDIRS=staticdemo bigintm subsets syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order interval cohomo

Singular/dyn_modules/gitfan/gitfan.cc

@@ -563 +563 @@
 }
 
-BOOLEAN subsets(leftv res, leftv args)
-{
-  leftv u = args;
-  if ((u!=NULL) && (u->Typ()==INT_CMD))
-  {
-    leftv v = u->next;
-    if ((v!=NULL) && (v->Typ()==INT_CMD) && (v->next==NULL))
-    {
-      int n = (int)(long) u->Data();
-      int k = (int)(long) v->Data();
-      std::vector<int> array(n);
-      for (int i=0; i<n; i++)
-        array[i]=i+1;
-      std::vector<int> ltemp;
-      std::vector<std::vector<int> > lt;
-      subset(array,n,k,0,ltemp,lt);
-
-      lists Lt = (lists) omAllocBin(slists_bin);
-      Lt->Init(lt.size());
-      for (int i=0; i<lt.size(); i++)
-      {
-        std::vector<int> lti = lt[i];
-        lists Lti = (lists) omAllocBin(slists_bin);
-        Lti->Init(k);
-        for(int j=0; j<lti.size(); j++)
-        {
-          Lti->m[j].rtyp = INT_CMD;
-          Lti->m[j].data = (void*)(long)lti[j];
-        }
-        Lt->m[i].rtyp = LIST_CMD;
-        Lt->m[i].data = (void*) Lti;
-      }
-
-      res->rtyp = LIST_CMD;
-      res->data = (void*) Lt;
-      return FALSE;
-    }
-  }
-  WerrorS("subsets: unexpected parameter");
-  return TRUE;
-}
-
-
 extern "C" int SI_MOD_INIT(gitfan) (SModulFunctions* p)
 {
@@ -616 +573 @@
   p->iiAddCproc("gitfan.lib","composeIntvecs",FALSE,composeIntvecs);
   p->iiAddCproc("gitfan.lib","findPlaceToInsert",FALSE,findPlaceToInsert);
-  p->iiAddCproc("gitfan.lib","subsets",FALSE,subsets);
   return (MAX_TOK);
 }

Singular/dyn_modules/subsets/subsets.cc

@@ -43 +43 @@
       lists Lt = (lists) omAllocBin(slists_bin);
       Lt->Init(lt.size());
-      for (int i=0; i<lt.size(); i++)
+      for (unsigned i=0; i<lt.size(); i++)
       {
         std::vector<int> lti = lt[i];
         lists Lti = (lists) omAllocBin(slists_bin);
         Lti->Init(k);
-        for(int j=0; j<lti.size(); j++)
+        for(unsigned j=0; j<lti.size(); j++)
         {
           Lti->m[j].rtyp = INT_CMD;
@@ -68 +68 @@
 //------------------------------------------------------------------------
 // initialisation of the module
-extern "C" int SI_MOD_INIT(customstd)(SModulFunctions* p)
+extern "C" int SI_MOD_INIT(subsets)(SModulFunctions* p)
 {
   p->iiAddCproc("subsets.so","subsets",FALSE,subsets);

configure.ac

@@ -249 +249 @@
 AC_CONFIG_FILES([Singular/dyn_modules/singmathic/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/staticdemo/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/subsets/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/gitfan/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/interval/Makefile])

m4/options.m4

@@ -324 +324 @@
   L=""
   bi_staticdemo=false
+  bi_subsets=false
   bi_syzextra=false
   bi_pyobject=false
@@ -358 +359 @@
       case "${a}" in
        staticdemo ) bi_staticdemo=true;;
+       subsets ) bi_subsets=true;;
        syzextra ) bi_syzextra=true ;;
        pyobject ) bi_pyobject=true ;;
@@ -395 +397 @@
 
  AM_CONDITIONAL([SI_BUILTIN_STATICDEMO], [test x$bi_staticdemo = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_SUBSETS], [test x$bi_subsets = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_SYZEXTRA], [test x$bi_syzextra = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_PYOBJECT], [test x$bi_pyobject = xtrue])