Commit bbe21e43 authored by Tres Seaver's avatar Tres Seaver

For the children:

s/setop/set_operation/g
parent cfb1873d
...@@ -31,7 +31,7 @@ from ._base import TreeSet ...@@ -31,7 +31,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_int as _to_key from ._base import to_int as _to_key
from ._base import to_float as _to_value from ._base import to_float as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -91,12 +91,12 @@ IFTreeSetPy._mapping_type = IFBucketPy ...@@ -91,12 +91,12 @@ IFTreeSetPy._mapping_type = IFBucketPy
IFTreeSetPy._set_type = IFTreeSetPy._bucket_type = IFSetPy IFTreeSetPy._set_type = IFTreeSetPy._bucket_type = IFSetPy
differencePy = _setop(_difference, IFSetPy) differencePy = _set_operation(_difference, IFSetPy)
unionPy = _setop(_union, IFSetPy) unionPy = _set_operation(_union, IFSetPy)
intersectionPy = _setop(_intersection, IFSetPy) intersectionPy = _set_operation(_intersection, IFSetPy)
multiunionPy = _setop(_multiunion, IFSetPy) multiunionPy = _set_operation(_multiunion, IFSetPy)
weightedUnionPy = _setop(_weightedUnion, IFSetPy) weightedUnionPy = _set_operation(_weightedUnion, IFSetPy)
weightedIntersectionPy = _setop(_weightedIntersection, IFSetPy) weightedIntersectionPy = _set_operation(_weightedIntersection, IFSetPy)
try: try:
from _IFBTree import IFBucket from _IFBTree import IFBucket
......
...@@ -31,7 +31,7 @@ from ._base import TreeSet ...@@ -31,7 +31,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_int as _to_key from ._base import to_int as _to_key
from ._base import to_int as _to_value from ._base import to_int as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -92,13 +92,13 @@ IITreeSetPy._mapping_type = IIBucketPy ...@@ -92,13 +92,13 @@ IITreeSetPy._mapping_type = IIBucketPy
IITreeSetPy._set_type = IITreeSetPy._bucket_type = IISetPy IITreeSetPy._set_type = IITreeSetPy._bucket_type = IISetPy
differencePy = _setop(_difference, IISetPy) differencePy = _set_operation(_difference, IISetPy)
unionPy = _setop(_union, IISetPy) unionPy = _set_operation(_union, IISetPy)
intersectionPy = _setop(_intersection, IISetPy) intersectionPy = _set_operation(_intersection, IISetPy)
multiunionPy = _setop(_multiunion, IISetPy) multiunionPy = _set_operation(_multiunion, IISetPy)
weightedUnionPy = _setop(_weightedUnion, IISetPy) weightedUnionPy = _set_operation(_weightedUnion, IISetPy)
weightedIntersectionPy = _set_operation(_weightedIntersection, IISetPy)
weightedIntersectionPy = _setop(_weightedIntersection, IISetPy)
try: try:
from _IIBTree import IIBucket from _IIBTree import IIBucket
from _IIBTree import IISet from _IIBTree import IISet
......
...@@ -28,7 +28,7 @@ from ._base import TreeSet ...@@ -28,7 +28,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_int as _to_key from ._base import to_int as _to_key
from ._base import to_ob as _to_value from ._base import to_ob as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -77,10 +77,10 @@ IOTreeSetPy._mapping_type = IOBucketPy ...@@ -77,10 +77,10 @@ IOTreeSetPy._mapping_type = IOBucketPy
IOTreeSetPy._set_type = IOTreeSetPy._bucket_type = IOSetPy IOTreeSetPy._set_type = IOTreeSetPy._bucket_type = IOSetPy
differencePy = _setop(_difference, IOSetPy) differencePy = _set_operation(_difference, IOSetPy)
unionPy = _setop(_union, IOSetPy) unionPy = _set_operation(_union, IOSetPy)
intersectionPy = _setop(_intersection, IOSetPy) intersectionPy = _set_operation(_intersection, IOSetPy)
multiunionPy = _setop(_multiunion, IOSetPy) multiunionPy = _set_operation(_multiunion, IOSetPy)
try: try:
from _IOBTree import IOBucket from _IOBTree import IOBucket
......
...@@ -31,7 +31,7 @@ from ._base import TreeSet ...@@ -31,7 +31,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_long as _to_key from ._base import to_long as _to_key
from ._base import to_float as _to_value from ._base import to_float as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -92,12 +92,12 @@ LFTreeSetPy._mapping_type = LFBucketPy ...@@ -92,12 +92,12 @@ LFTreeSetPy._mapping_type = LFBucketPy
LFTreeSetPy._set_type = LFTreeSetPy._bucket_type = LFSetPy LFTreeSetPy._set_type = LFTreeSetPy._bucket_type = LFSetPy
differencePy = _setop(_difference, LFSetPy) differencePy = _set_operation(_difference, LFSetPy)
unionPy = _setop(_union, LFSetPy) unionPy = _set_operation(_union, LFSetPy)
intersectionPy = _setop(_intersection, LFSetPy) intersectionPy = _set_operation(_intersection, LFSetPy)
multiunionPy = _setop(_multiunion, LFSetPy) multiunionPy = _set_operation(_multiunion, LFSetPy)
weightedUnionPy = _setop(_weightedUnion, LFSetPy) weightedUnionPy = _set_operation(_weightedUnion, LFSetPy)
weightedIntersectionPy = _setop(_weightedIntersection, LFSetPy) weightedIntersectionPy = _set_operation(_weightedIntersection, LFSetPy)
try: try:
from _LFBTree import LFBucket from _LFBTree import LFBucket
......
...@@ -31,7 +31,7 @@ from ._base import TreeSet ...@@ -31,7 +31,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_long as _to_key from ._base import to_long as _to_key
from ._base import to_long as _to_value from ._base import to_long as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -92,12 +92,12 @@ LLTreeSetPy._mapping_type = LLBucketPy ...@@ -92,12 +92,12 @@ LLTreeSetPy._mapping_type = LLBucketPy
LLTreeSetPy._set_type = LLTreeSetPy._bucket_type = LLSetPy LLTreeSetPy._set_type = LLTreeSetPy._bucket_type = LLSetPy
differencePy = _setop(_difference, LLSetPy) differencePy = _set_operation(_difference, LLSetPy)
unionPy = _setop(_union, LLSetPy) unionPy = _set_operation(_union, LLSetPy)
intersectionPy = _setop(_intersection, LLSetPy) intersectionPy = _set_operation(_intersection, LLSetPy)
multiunionPy = _setop(_multiunion, LLSetPy) multiunionPy = _set_operation(_multiunion, LLSetPy)
weightedUnionPy = _setop(_weightedUnion, LLSetPy) weightedUnionPy = _set_operation(_weightedUnion, LLSetPy)
weightedIntersectionPy = _setop(_weightedIntersection, LLSetPy) weightedIntersectionPy = _set_operation(_weightedIntersection, LLSetPy)
try: try:
from _LLBTree import LLBucket from _LLBTree import LLBucket
......
...@@ -28,7 +28,7 @@ from ._base import TreeSet ...@@ -28,7 +28,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_long as _to_key from ._base import to_long as _to_key
from ._base import to_ob as _to_value from ._base import to_ob as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -77,10 +77,10 @@ LOTreeSetPy._mapping_type = LOBucketPy ...@@ -77,10 +77,10 @@ LOTreeSetPy._mapping_type = LOBucketPy
LOTreeSetPy._set_type = LOTreeSetPy._bucket_type = LOSetPy LOTreeSetPy._set_type = LOTreeSetPy._bucket_type = LOSetPy
differencePy = _setop(_difference, LOSetPy) differencePy = _set_operation(_difference, LOSetPy)
unionPy = _setop(_union, LOSetPy) unionPy = _set_operation(_union, LOSetPy)
intersectionPy = _setop(_intersection, LOSetPy) intersectionPy = _set_operation(_intersection, LOSetPy)
multiunionPy = _setop(_multiunion, LOSetPy) multiunionPy = _set_operation(_multiunion, LOSetPy)
try: try:
from _LOBTree import LOBucket from _LOBTree import LOBucket
......
...@@ -30,7 +30,7 @@ from ._base import Tree as BTree ...@@ -30,7 +30,7 @@ from ._base import Tree as BTree
from ._base import TreeSet from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key from ._base import to_ob as _to_key
from ._base import to_int as _to_value from ._base import to_int as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -90,11 +90,11 @@ OITreeSetPy._mapping_type = OIBucketPy ...@@ -90,11 +90,11 @@ OITreeSetPy._mapping_type = OIBucketPy
OITreeSetPy._set_type = OITreeSetPy._bucket_type = OISetPy OITreeSetPy._set_type = OITreeSetPy._bucket_type = OISetPy
differencePy = _setop(_difference, OISetPy) differencePy = _set_operation(_difference, OISetPy)
unionPy = _setop(_union, OISetPy) unionPy = _set_operation(_union, OISetPy)
intersectionPy = _setop(_intersection, OISetPy) intersectionPy = _set_operation(_intersection, OISetPy)
weightedUnionPy = _setop(_weightedUnion, OISetPy) weightedUnionPy = _set_operation(_weightedUnion, OISetPy)
weightedIntersectionPy = _setop(_weightedIntersection, OISetPy) weightedIntersectionPy = _set_operation(_weightedIntersection, OISetPy)
try: try:
from _OIBTree import OIBucket from _OIBTree import OIBucket
......
...@@ -30,7 +30,7 @@ from ._base import Tree as BTree ...@@ -30,7 +30,7 @@ from ._base import Tree as BTree
from ._base import TreeSet from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key from ._base import to_ob as _to_key
from ._base import to_int as _to_value from ._base import to_int as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -91,11 +91,11 @@ OLTreeSetPy._mapping_type = OLBucketPy ...@@ -91,11 +91,11 @@ OLTreeSetPy._mapping_type = OLBucketPy
OLTreeSetPy._set_type = OLTreeSetPy._bucket_type = OLSetPy OLTreeSetPy._set_type = OLTreeSetPy._bucket_type = OLSetPy
differencePy = _setop(_difference, OLSetPy) differencePy = _set_operation(_difference, OLSetPy)
unionPy = _setop(_union, OLSetPy) unionPy = _set_operation(_union, OLSetPy)
intersectionPy = _setop(_intersection, OLSetPy) intersectionPy = _set_operation(_intersection, OLSetPy)
weightedUnionPy = _setop(_weightedUnion, OLSetPy) weightedUnionPy = _set_operation(_weightedUnion, OLSetPy)
weightedIntersectionPy = _setop(_weightedIntersection, OLSetPy) weightedIntersectionPy = _set_operation(_weightedIntersection, OLSetPy)
try: try:
from _OLBTree import OLBucket from _OLBTree import OLBucket
......
...@@ -26,7 +26,7 @@ from ._base import Tree as BTree ...@@ -26,7 +26,7 @@ from ._base import Tree as BTree
from ._base import TreeSet from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key from ._base import to_ob as _to_key
from ._base import to_ob as _to_value from ._base import to_ob as _to_value
from ._base import union as _union from ._base import union as _union
...@@ -78,9 +78,9 @@ OOTreeSetPy._mapping_type = OOBucketPy ...@@ -78,9 +78,9 @@ OOTreeSetPy._mapping_type = OOBucketPy
OOTreeSetPy._set_type = OOTreeSetPy._bucket_type = OOSetPy OOTreeSetPy._set_type = OOTreeSetPy._bucket_type = OOSetPy
differencePy = _setop(_difference, OOSetPy) differencePy = _set_operation(_difference, OOSetPy)
unionPy = _setop(_union, OOSetPy) unionPy = _set_operation(_union, OOSetPy)
intersectionPy = _setop(_intersection, OOSetPy) intersectionPy = _set_operation(_intersection, OOSetPy)
try: try:
from _OOBTree import OOBucket from _OOBTree import OOBucket
......
...@@ -1203,7 +1203,7 @@ def _set_operation(s1, s2, ...@@ -1203,7 +1203,7 @@ def _set_operation(s1, s2,
return r return r
class setop(object): class set_operation(object):
def __init__(self, func, set_type): def __init__(self, func, set_type):
self.func = func self.func = func
......
...@@ -31,7 +31,7 @@ from ._base import TreeSet ...@@ -31,7 +31,7 @@ from ._base import TreeSet
from ._base import difference as _difference from ._base import difference as _difference
from ._base import intersection as _intersection from ._base import intersection as _intersection
from ._base import multiunion as _multiunion from ._base import multiunion as _multiunion
from ._base import setop as _setop from ._base import set_operation as _set_operation
from ._base import to_str as _to_str from ._base import to_str as _to_str
from ._base import union as _union from ._base import union as _union
...@@ -101,10 +101,10 @@ fsTreeSetPy._mapping_type = fsBucketPy ...@@ -101,10 +101,10 @@ fsTreeSetPy._mapping_type = fsBucketPy
fsTreeSetPy._set_type = fsTreeSetPy._bucket_type = fsSetPy fsTreeSetPy._set_type = fsTreeSetPy._bucket_type = fsSetPy
differencePy = _setop(_difference, fsSetPy) differencePy = _set_operation(_difference, fsSetPy)
unionPy = _setop(_union, fsSetPy) unionPy = _set_operation(_union, fsSetPy)
intersectionPy = _setop(_intersection, fsSetPy) intersectionPy = _set_operation(_intersection, fsSetPy)
multiunionPy = _setop(_multiunion, fsSetPy) multiunionPy = _set_operation(_multiunion, fsSetPy)
try: try:
from _fsBTree import fsBucket from _fsBTree import fsBucket
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment