Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
b8e99086
Commit
b8e99086
authored
10 years ago
by
Studer Gabriel
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into mm
parents
bd8e29ac
68a43c51
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/seq/alg/pymod/wrap_seq_alg.cc
+2
-0
2 additions, 0 deletions
modules/seq/alg/pymod/wrap_seq_alg.cc
modules/seq/alg/src/subst_weight_matrix.hh
+2
-2
2 additions, 2 deletions
modules/seq/alg/src/subst_weight_matrix.hh
with
4 additions
and
2 deletions
modules/seq/alg/pymod/wrap_seq_alg.cc
+
2
−
0
View file @
b8e99086
...
@@ -61,6 +61,8 @@ BOOST_PYTHON_MODULE(_ost_seq_alg)
...
@@ -61,6 +61,8 @@ BOOST_PYTHON_MODULE(_ost_seq_alg)
class_
<
SubstWeightMatrix
,
SubstWeightMatrixPtr
>
(
"SubstWeightMatrix"
,
init
<>
())
class_
<
SubstWeightMatrix
,
SubstWeightMatrixPtr
>
(
"SubstWeightMatrix"
,
init
<>
())
.
def
(
"GetWeight"
,
&
SubstWeightMatrix
::
GetWeight
)
.
def
(
"GetWeight"
,
&
SubstWeightMatrix
::
GetWeight
)
.
def
(
"SetWeight"
,
&
SubstWeightMatrix
::
SetWeight
)
.
def
(
"SetWeight"
,
&
SubstWeightMatrix
::
SetWeight
)
.
def
(
"GetMinWeight"
,
&
SubstWeightMatrix
::
GetMinWeight
)
.
def
(
"GetMaxWeight"
,
&
SubstWeightMatrix
::
GetMaxWeight
)
;
;
def
(
"MergePairwiseAlignments"
,
&
MergePairwiseAlignments
);
def
(
"MergePairwiseAlignments"
,
&
MergePairwiseAlignments
);
...
...
This diff is collapsed.
Click to expand it.
modules/seq/alg/src/subst_weight_matrix.hh
+
2
−
2
View file @
b8e99086
...
@@ -65,10 +65,10 @@ public:
...
@@ -65,10 +65,10 @@ public:
}
}
/// \brief Get the minimal substitution weight of the matrix
/// \brief Get the minimal substitution weight of the matrix
WeightType
GetMinWeight
()
{
return
min_weight_
;
}
WeightType
GetMinWeight
()
const
{
return
min_weight_
;
}
/// \brief Get the maximal substitution weight of the matrix
/// \brief Get the maximal substitution weight of the matrix
WeightType
GetMaxWeight
()
{
return
max_weight_
;
}
WeightType
GetMaxWeight
()
const
{
return
max_weight_
;
}
/// \brief Set the substitution weight between two amino acids
/// \brief Set the substitution weight between two amino acids
///
///
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment