Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
5fb4ee66
Commit
5fb4ee66
authored
May 20, 2013
by
Davis King
Browse files
Added the vectorss and sparse_vectorss types and a little more documentation.
parent
9f022ec0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
4 deletions
+22
-4
tools/python/src/basic.cpp
tools/python/src/basic.cpp
+21
-3
tools/python/src/vector.cpp
tools/python/src/vector.cpp
+1
-1
No files found.
tools/python/src/basic.cpp
View file @
5fb4ee66
...
@@ -110,12 +110,21 @@ void bind_basic_types()
...
@@ -110,12 +110,21 @@ void bind_basic_types()
.
def
(
"resize"
,
resize
<
std
::
vector
<
double
>
>
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
double
>
>
)
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
double
>
>
());
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
double
>
>
());
class_
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
(
"vectors"
)
class_
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
(
"vectors"
,
"This object is an array of vector objects."
)
.
def
(
vector_indexing_suite
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
())
.
def
(
vector_indexing_suite
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
())
.
def
(
"clear"
,
&
std
::
vector
<
matrix
<
double
,
0
,
1
>
>::
clear
)
.
def
(
"clear"
,
&
std
::
vector
<
matrix
<
double
,
0
,
1
>
>::
clear
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
)
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
());
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
());
{
typedef
std
::
vector
<
std
::
vector
<
matrix
<
double
,
0
,
1
>
>
>
type
;
class_
<
type
>
(
"vectorss"
,
"This object is an array of arrays of vector objects."
)
.
def
(
vector_indexing_suite
<
type
>
())
.
def
(
"clear"
,
&
type
::
clear
)
.
def
(
"resize"
,
resize
<
type
>
)
.
def_pickle
(
serialize_pickle
<
type
>
());
}
typedef
pair
<
unsigned
long
,
double
>
pair_type
;
typedef
pair
<
unsigned
long
,
double
>
pair_type
;
class_
<
pair_type
>
(
"pair"
,
"This object is used to represent the elements of a sparse_vector."
,
init
<>
()
)
class_
<
pair_type
>
(
"pair"
,
"This object is used to represent the elements of a sparse_vector."
,
init
<>
()
)
.
def
(
init
<
unsigned
long
,
double
>
())
.
def
(
init
<
unsigned
long
,
double
>
())
...
@@ -125,7 +134,7 @@ void bind_basic_types()
...
@@ -125,7 +134,7 @@ void bind_basic_types()
.
def
(
"__repr__"
,
pair__repr__
)
.
def
(
"__repr__"
,
pair__repr__
)
.
def_pickle
(
serialize_pickle
<
pair_type
>
());
.
def_pickle
(
serialize_pickle
<
pair_type
>
());
class_
<
std
::
vector
<
pair_type
>
>
(
"sparse_vector"
)
class_
<
std
::
vector
<
pair_type
>
>
(
"sparse_vector"
,
"This object represents the mathematical idea of a column vector."
)
.
def
(
vector_indexing_suite
<
std
::
vector
<
pair_type
>
>
())
.
def
(
vector_indexing_suite
<
std
::
vector
<
pair_type
>
>
())
.
def
(
"__str__"
,
sparse_vector__str__
)
.
def
(
"__str__"
,
sparse_vector__str__
)
.
def
(
"__repr__"
,
sparse_vector__repr__
)
.
def
(
"__repr__"
,
sparse_vector__repr__
)
...
@@ -133,11 +142,20 @@ void bind_basic_types()
...
@@ -133,11 +142,20 @@ void bind_basic_types()
.
def
(
"resize"
,
resize
<
std
::
vector
<
pair_type
>
>
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
pair_type
>
>
)
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
pair_type
>
>
());
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
pair_type
>
>
());
class_
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
(
"sparse_vectors"
)
class_
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
(
"sparse_vectors"
,
"This object is an array of sparse_vector objects."
)
.
def
(
vector_indexing_suite
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
())
.
def
(
vector_indexing_suite
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
())
.
def
(
"clear"
,
&
std
::
vector
<
std
::
vector
<
pair_type
>
>::
clear
)
.
def
(
"clear"
,
&
std
::
vector
<
std
::
vector
<
pair_type
>
>::
clear
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
)
.
def
(
"resize"
,
resize
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
)
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
());
.
def_pickle
(
serialize_pickle
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
());
{
typedef
std
::
vector
<
std
::
vector
<
std
::
vector
<
pair_type
>
>
>
type
;
class_
<
type
>
(
"sparse_vectorss"
,
"This object is an array of arrays of sparse_vector objects."
)
.
def
(
vector_indexing_suite
<
type
>
())
.
def
(
"clear"
,
&
type
::
clear
)
.
def
(
"resize"
,
resize
<
type
>
)
.
def_pickle
(
serialize_pickle
<
type
>
());
}
}
}
tools/python/src/vector.cpp
View file @
5fb4ee66
...
@@ -105,7 +105,7 @@ tuple cv_get_matrix_size(cv& m)
...
@@ -105,7 +105,7 @@ tuple cv_get_matrix_size(cv& m)
void
bind_vector
()
void
bind_vector
()
{
{
class_
<
cv
>
(
"vector"
,
init
<>
())
class_
<
cv
>
(
"vector"
,
"This object represents the mathematical idea of a column vector."
,
init
<>
())
.
def
(
"set_size"
,
&
cv_set_size
)
.
def
(
"set_size"
,
&
cv_set_size
)
.
def
(
"resize"
,
&
cv_set_size
)
.
def
(
"resize"
,
&
cv_set_size
)
.
def
(
"__init__"
,
make_constructor
(
&
cv_from_object
))
.
def
(
"__init__"
,
make_constructor
(
&
cv_from_object
))
...
...
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