Changeset 4704b07 in tol

Timestamp:

Mar 1, 2010, 4:33:16 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

f77a89a

Parents:

33ccd82

Message:

New built-in function SetConcat

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2046 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/set_type/setgra.cpp (modified) (2 diffs)

tol/btol/set_type/setgra.cpp

@@ -590 +590 @@
 
 //--------------------------------------------------------------------
-DeclareContensClass(BSet, BSetTemporary, BSetConcatAll);
-DefIntOpr(1, BSetConcatAll, "Concat", 2, 0,
-          I2("(Set set1, Set set2 [, Set set3, ...])",
-             "(Set cto1, Set cto2 [, Set cto3, ...])"),
-          I2("Returns the concatenation of two or more sets.",
-             "Devuelve la concatenación de dos o más conjuntos."),
-          BOperClassify::SetAlgebra_);
-//--------------------------------------------------------------------
-void BSetConcatAll::CalcContens()
-//--------------------------------------------------------------------
-{
-  BSet setOfSets;
-  setOfSets.PutElement(ArgList());
+void setConcat(const BSet& setOfSets, BSet& contens_)
+//--------------------------------------------------------------------
+{
   int k, n, totCard = 0;
   for(n=1; n<=setOfSets.Card(); n++)
   { 
-    BSet& set = Set(setOfSets[n]);
-    totCard += set.Card(); 
+    if(setOfSets[n]->Grammar()==GraSet())
+    {
+      BSet& set = Set(setOfSets[n]);
+      totCard += set.Card(); 
+    }
   }
   contens_.PrepareStore(totCard);
   for(n=1; n<=setOfSets.Card(); n++)
   {
-    BSet& set = Set(setOfSets[n]);
-    for(k=1; k<=set.Card(); k++)
-    {
-      contens_.AddElement(set[k]);
-    }
-  }
-}
-
+    if(setOfSets[n]->Grammar()==GraSet())
+    {
+      BSet& set = Set(setOfSets[n]);
+      for(k=1; k<=set.Card(); k++)
+      {
+        contens_.AddElement(set[k]);
+      }
+    }
+  }
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BSet, BSetTemporary, BSetConcatAll);
+DefIntOpr(1, BSetConcatAll, "Concat", 1, 0,
+          "(Set set1 [, Set set2, ...])",
+          I2("Returns the concatenation of a list of sets.",
+             "Devuelve la concatenación de una lista conjuntos."),
+          BOperClassify::SetAlgebra_);
+//--------------------------------------------------------------------
+void BSetConcatAll::CalcContens()
+//--------------------------------------------------------------------
+{
+  BSet setOfSets;
+  setOfSets.PutElement(ArgList());
+  setConcat(setOfSets, contens_);
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BSet, BSetTemporary, BSetSetConcat);
+DefIntOpr(1, BSetSetConcat, "SetConcat", 1, 1,
+          "(Set set)",
+          I2("Returns the concatenation of a the elements of a set of sets.",
+             "Devuelve la concatenación de los elementos de un conjunto de "
+       "conjuntos."),
+          BOperClassify::SetAlgebra_);
+//--------------------------------------------------------------------
+void BSetSetConcat::CalcContens()
+//--------------------------------------------------------------------
+{
+  BSet& setOfSets = Set(Arg(1));
+  setConcat(setOfSets, contens_);
+}
 
 //--------------------------------------------------------------------
@@ -713 +740 @@
 DefIntOpr(1, BSetCartesianProduct, "CartProd", 2, 0,
           I2("(Set set1, Set set2 [, Set set3, ...])",
-             "(Set cto1, Set cto2 [, Set cto3, ...])"),
-          I2("Returns the cartesian product of two or more sets.",
-             "Devuelve el producto cartesiano de dos o más conjuntos."),
+             "(Set cto1, Set set2 [, Set cto3, ...])"),
+          I2("Returns the cartesian product of a list of sets.",
+             "Devuelve el producto cartesiano de una lista de conjuntos."),
           BOperClassify::SetAlgebra_);