Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BTrees
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
BTrees
Commits
b61ba97b
Commit
b61ba97b
authored
Nov 09, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get the setOp tests passing.
parent
283fde0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
58 deletions
+62
-58
BTrees/OOBTree.py
BTrees/OOBTree.py
+4
-0
BTrees/___BTree.py
BTrees/___BTree.py
+58
-48
BTrees/tests/testSetOps.py
BTrees/tests/testSetOps.py
+0
-10
No files found.
BTrees/OOBTree.py
View file @
b61ba97b
...
@@ -34,6 +34,8 @@ class OOBucketPy(Bucket):
...
@@ -34,6 +34,8 @@ class OOBucketPy(Bucket):
MAX_SIZE
=
_BUCKET_SIZE
MAX_SIZE
=
_BUCKET_SIZE
_to_key
=
_to_key
_to_key
=
_to_key
_to_value
=
_to_value
_to_value
=
_to_value
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
value
try
:
try
:
from
_OOBTree
import
OOBucket
from
_OOBTree
import
OOBucket
except
ImportError
:
except
ImportError
:
...
@@ -55,6 +57,8 @@ class OOBTreePy(BTree):
...
@@ -55,6 +57,8 @@ class OOBTreePy(BTree):
MAX_SIZE
=
_TREE_SIZE
MAX_SIZE
=
_TREE_SIZE
_to_key
=
_to_key
_to_key
=
_to_key
_to_value
=
_to_value
_to_value
=
_to_value
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
value
try
:
try
:
from
_OOBTree
import
OOBTree
from
_OOBTree
import
OOBTree
except
ImportError
:
except
ImportError
:
...
...
BTrees/___BTree.py
View file @
b61ba97b
...
@@ -283,9 +283,9 @@ class _BucketBase(_Base):
...
@@ -283,9 +283,9 @@ class _BucketBase(_Base):
result
.
_next
=
buckets
[
0
].
_next
result
.
_next
=
buckets
[
0
].
_next
return
result
.
__getstate__
()
return
result
.
__getstate__
()
class
_SetIteration
:
class
_SetIteration
(
object
)
:
def
__init__
(
self
,
set
,
useValues
=
False
):
def
__init__
(
self
,
set
,
useValues
=
False
,
default
=
None
):
if
set
is
None
:
if
set
is
None
:
set
=
()
set
=
()
self
.
set
=
set
self
.
set
=
set
...
@@ -295,6 +295,8 @@ class _SetIteration:
...
@@ -295,6 +295,8 @@ class _SetIteration:
except
AttributeError
:
except
AttributeError
:
itmeth
=
set
.
__iter__
itmeth
=
set
.
__iter__
useValues
=
False
useValues
=
False
else
:
self
.
value
=
None
else
:
else
:
itmeth
=
set
.
__iter__
itmeth
=
set
.
__iter__
...
@@ -302,6 +304,7 @@ class _SetIteration:
...
@@ -302,6 +304,7 @@ class _SetIteration:
self
.
_next
=
itmeth
().
next
self
.
_next
=
itmeth
().
next
self
.
active
=
True
self
.
active
=
True
self
.
position
=
0
self
.
position
=
0
self
.
value
=
default
self
.
advance
()
self
.
advance
()
def
advance
(
self
):
def
advance
(
self
):
...
@@ -483,18 +486,6 @@ class Bucket(_MappingBase, _BucketBase):
...
@@ -483,18 +486,6 @@ class Bucket(_MappingBase, _BucketBase):
keys
.
append
(
state
[
i
])
keys
.
append
(
state
[
i
])
values
.
append
(
state
[
i
+
1
])
values
.
append
(
state
[
i
+
1
])
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
0
# fload / int value trees override to return value * weight
class
NumericValueBucket
(
Bucket
):
# Base for ?FTree, ?ITree, ?LTree classes.
def
MERGE
(
self
,
value1
,
weight1
,
value2
,
weight2
):
return
(
value1
*
weight1
)
+
(
value2
*
weight1
)
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
value
*
weight
class
Set
(
_SetBase
,
_BucketBase
):
class
Set
(
_SetBase
,
_BucketBase
):
...
@@ -1002,17 +993,6 @@ class Tree(_Tree):
...
@@ -1002,17 +993,6 @@ class Tree(_Tree):
def
insert
(
self
,
key
,
value
):
def
insert
(
self
,
key
,
value
):
return
bool
(
self
.
_set
(
key
,
value
,
True
)[
0
])
return
bool
(
self
.
_set
(
key
,
value
,
True
)[
0
])
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
0
# fload / int value trees override to return value * weight
class
NumericValueTree
(
Tree
):
# Base for ?FTree, ?ITree, ?LTree classes.
def
MERGE
(
self
,
value1
,
weight1
,
value2
,
weight2
):
return
(
value1
*
weight1
)
+
(
value2
*
weight1
)
def
MERGE_WEIGHT
(
self
,
value
,
weight
):
return
value
*
weight
class
TreeSet
(
_SetBase
,
_Tree
):
class
TreeSet
(
_SetBase
,
_Tree
):
pass
pass
...
@@ -1022,8 +1002,9 @@ def _set_operation(s1, s2,
...
@@ -1022,8 +1002,9 @@ def _set_operation(s1, s2,
usevalues1
=
False
,
usevalues2
=
False
,
usevalues1
=
False
,
usevalues2
=
False
,
w1
=
1
,
w2
=
1
,
w1
=
1
,
w2
=
1
,
c1
=
True
,
c12
=
True
,
c2
=
True
):
c1
=
True
,
c12
=
True
,
c2
=
True
):
i1
=
_SetIteration
(
s1
,
usevalues1
)
MERGE_DEFAULT
=
getattr
(
s1
,
'MERGE_DEFAULT'
,
None
)
i2
=
_SetIteration
(
s2
,
usevalues2
)
i1
=
_SetIteration
(
s1
,
usevalues1
,
MERGE_DEFAULT
)
i2
=
_SetIteration
(
s2
,
usevalues2
,
MERGE_DEFAULT
)
merge
=
i1
.
useValues
or
i2
.
useValues
merge
=
i1
.
useValues
or
i2
.
useValues
MERGE
=
getattr
(
s1
,
'MERGE'
,
None
)
MERGE
=
getattr
(
s1
,
'MERGE'
,
None
)
if
merge
:
if
merge
:
...
@@ -1036,10 +1017,7 @@ def _set_operation(s1, s2,
...
@@ -1036,10 +1017,7 @@ def _set_operation(s1, s2,
t
=
w1
;
w1
=
w2
;
w2
=
t
t
=
w1
;
w1
=
w2
;
w2
=
t
t
=
c1
;
c1
=
c2
;
c2
=
t
t
=
c1
;
c1
=
c2
;
c2
=
t
MERGE_DEFAULT
=
getattr
(
s1
,
'MERGE_DEFAULT'
,
None
)
if
MERGE_DEFAULT
is
None
:
if
MERGE_DEFAULT
is
not
None
:
i1
.
value
=
i2
.
value
=
MERGE_DEFAULT
else
:
if
i1
.
useValues
:
if
i1
.
useValues
:
if
(
not
i2
.
useValues
)
and
c2
:
if
(
not
i2
.
useValues
)
and
c2
:
raise
TypeError
(
"invalid set operation"
)
raise
TypeError
(
"invalid set operation"
)
...
@@ -1123,7 +1101,7 @@ def weightedUnion(set_type, o1, o2, w1=1, w2=1):
...
@@ -1123,7 +1101,7 @@ def weightedUnion(set_type, o1, o2, w1=1, w2=1):
elif
o2
is
None
:
elif
o2
is
None
:
return
w1
,
o1
return
w1
,
o1
else
:
else
:
return
1
,
_set_operation
(
o1
,
o2
,
1
,
1
,
w1
,
w2
,
0
,
1
,
0
)
return
1
,
_set_operation
(
o1
,
o2
,
1
,
1
,
w1
,
w2
,
1
,
1
,
1
)
def
weightedIntersection
(
set_type
,
o1
,
o2
,
w1
=
1
,
w2
=
1
):
def
weightedIntersection
(
set_type
,
o1
,
o2
,
w1
=
1
,
w2
=
1
):
if
o1
is
None
:
if
o1
is
None
:
...
@@ -1134,10 +1112,8 @@ def weightedIntersection(set_type, o1, o2, w1=1, w2=1):
...
@@ -1134,10 +1112,8 @@ def weightedIntersection(set_type, o1, o2, w1=1, w2=1):
elif
o2
is
None
:
elif
o2
is
None
:
return
w1
,
o1
return
w1
,
o1
else
:
else
:
return
(
result
=
_set_operation
(
o1
,
o2
,
1
,
1
,
w1
,
w2
,
0
,
1
,
0
)
w1
+
w2
if
isinstance
(
o1
,
Set
)
else
1
,
return
(
w1
+
w2
if
isinstance
(
result
,
(
Set
,
TreeSet
))
else
1
,
result
)
_set_operation
(
o1
,
o2
,
1
,
1
,
w1
,
w2
,
0
,
1
,
0
),
)
def
multiunion
(
set_type
,
seqs
):
def
multiunion
(
set_type
,
seqs
):
# XXX simple/slow implementation. Goal is just to get tests to pass.
# XXX simple/slow implementation. Goal is just to get tests to pass.
...
@@ -1197,9 +1173,18 @@ def to_str(l):
...
@@ -1197,9 +1173,18 @@ def to_str(l):
return
to
return
to
tos
=
dict
(
I
=
to_int
,
L
=
to_long
,
F
=
to_float
,
O
=
to_ob
)
tos
=
dict
(
I
=
to_int
,
L
=
to_long
,
F
=
to_float
,
O
=
to_ob
)
treetypes
=
dict
(
I
=
NumericValueTree
,
L
=
NumericValueTree
,
F
=
NumericValueTree
)
buckettypes
=
dict
(
I
=
NumericValueBucket
,
L
=
NumericValueBucket
,
MERGE_DEFAULT_int
=
1
F
=
NumericValueBucket
)
MERGE_DEFAULT_float
=
1.0
def
MERGE
(
self
,
value1
,
weight1
,
value2
,
weight2
):
return
(
value1
*
weight1
)
+
(
value2
*
weight2
)
def
MERGE_WEIGHT_default
(
self
,
value
,
weight
):
return
value
def
MERGE_WEIGHT_numeric
(
self
,
value
,
weight
):
return
value
*
weight
def
_import
(
globals
,
prefix
,
bucket_size
,
tree_size
,
def
_import
(
globals
,
prefix
,
bucket_size
,
tree_size
,
to_key
=
None
,
to_value
=
None
):
to_key
=
None
,
to_value
=
None
):
...
@@ -1207,15 +1192,40 @@ def _import(globals, prefix, bucket_size, tree_size,
...
@@ -1207,15 +1192,40 @@ def _import(globals, prefix, bucket_size, tree_size,
to_key
=
tos
[
prefix
[
0
]]
to_key
=
tos
[
prefix
[
0
]]
if
to_value
is
None
:
if
to_value
is
None
:
to_value
=
tos
[
prefix
[
1
]]
to_value
=
tos
[
prefix
[
1
]]
buckettype
=
buckettypes
.
get
(
prefix
[
1
],
Bucket
)
mc
=
Bucket
.
__class__
mc
=
buckettype
.
__class__
b_dict
=
{
'MAX_SIZE'
:
bucket_size
,
bucket
=
mc
(
prefix
+
'Bucket'
,
(
buckettype
,
),
dict
(
MAX_SIZE
=
bucket_size
,
'_to_value'
:
to_value
,
_to_value
=
to_value
))
'MERGE_WEIGHT'
:
MERGE_WEIGHT_default
,
set
=
mc
(
prefix
+
'Set'
,
(
Set
,
),
dict
(
MAX_SIZE
=
bucket_size
))
}
treetype
=
treetypes
.
get
(
prefix
[
1
],
Tree
)
t_dict
=
{
'MAX_SIZE'
:
tree_size
,
tree
=
mc
(
prefix
+
'BTree'
,
(
treetype
,
),
dict
(
MAX_SIZE
=
tree_size
,
'_to_value'
:
to_value
,
_to_value
=
to_value
))
'MERGE_WEIGHT'
:
MERGE_WEIGHT_default
,
treeset
=
mc
(
prefix
+
'TreeSet'
,
(
TreeSet
,
),
dict
(
MAX_SIZE
=
tree_size
))
}
s_dict
=
{
'MAX_SIZE'
:
bucket_size
,
'MERGE_WEIGHT'
:
MERGE_WEIGHT_default
,
}
ts_dict
=
{
'MAX_SIZE'
:
tree_size
,
'MERGE_WEIGHT'
:
MERGE_WEIGHT_default
,
}
if
prefix
[
1
]
in
'IL'
:
b_dict
[
'MERGE'
]
=
t_dict
[
'MERGE'
]
=
MERGE
s_dict
[
'MERGE'
]
=
ts_dict
[
'MERGE'
]
=
MERGE
b_dict
[
'MERGE_DEFAULT'
]
=
t_dict
[
'MERGE_DEFAULT'
]
=
MERGE_DEFAULT_int
s_dict
[
'MERGE_DEFAULT'
]
=
ts_dict
[
'MERGE_DEFAULT'
]
=
MERGE_DEFAULT_int
b_dict
[
'MERGE_WEIGHT'
]
=
t_dict
[
'MERGE_WEIGHT'
]
=
MERGE_WEIGHT_numeric
s_dict
[
'MERGE_WEIGHT'
]
=
ts_dict
[
'MERGE_WEIGHT'
]
=
MERGE_WEIGHT_numeric
elif
prefix
[
1
]
==
'F'
:
b_dict
[
'MERGE'
]
=
t_dict
[
'MERGE'
]
=
MERGE
s_dict
[
'MERGE'
]
=
ts_dict
[
'MERGE'
]
=
MERGE
b_dict
[
'MERGE_DEFAULT'
]
=
t_dict
[
'MERGE_DEFAULT'
]
=
MERGE_DEFAULT_float
s_dict
[
'MERGE_DEFAULT'
]
=
ts_dict
[
'MERGE_DEFAULT'
]
=
MERGE_DEFAULT_float
b_dict
[
'MERGE_WEIGHT'
]
=
t_dict
[
'MERGE_WEIGHT'
]
=
MERGE_WEIGHT_numeric
s_dict
[
'MERGE_WEIGHT'
]
=
ts_dict
[
'MERGE_WEIGHT'
]
=
MERGE_WEIGHT_numeric
bucket
=
mc
(
prefix
+
'Bucket'
,
(
Bucket
,
),
b_dict
)
set
=
mc
(
prefix
+
'Set'
,
(
Set
,
),
s_dict
)
tree
=
mc
(
prefix
+
'BTree'
,
(
Tree
,
),
t_dict
)
treeset
=
mc
(
prefix
+
'TreeSet'
,
(
TreeSet
,
),
ts_dict
)
for
c
in
bucket
,
set
,
tree
,
treeset
:
for
c
in
bucket
,
set
,
tree
,
treeset
:
c
.
_mapping_type
=
bucket
c
.
_mapping_type
=
bucket
c
.
_set_type
=
set
c
.
_set_type
=
set
...
...
BTrees/tests/testSetOps.py
View file @
b61ba97b
...
@@ -13,16 +13,6 @@
...
@@ -13,16 +13,6 @@
##############################################################################
##############################################################################
import
unittest
import
unittest
#from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
#from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
#from BTrees.IFBTree import IFBTree, IFBucket, IFSet, IFTreeSet
#from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
#from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
#from BTrees.LOBTree import LOBTree, LOBucket, LOSet, LOTreeSet
#from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
#from BTrees.LLBTree import LLBTree, LLBucket, LLSet, LLTreeSet
#from BTrees.OLBTree import OLBTree, OLBucket, OLSet, OLTreeSet
# Subclasses have to set up:
# Subclasses have to set up:
# builders() - function returning functions to build inputs,
# builders() - function returning functions to build inputs,
# each returned callable tkes an optional keys arg
# each returned callable tkes an optional keys arg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment