Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Louis BECQUEY
/
biorseo
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Network
Create a new issue
Builds
Commits
Authored by
Louis BECQUEY
2019-02-27 15:45:01 +0100
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fc998ce446e7e9ee991a480ee5836ebaf26621f3
fc998ce4
1 parent
c8c121a1
Verbose changes for Release version
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
Makefile
cppsrc/MOIP.cpp
cppsrc/Motif.cpp
cppsrc/biominserter.cpp
Makefile
View file @
fc998ce
...
...
@@ -9,7 +9,7 @@ TARGET = biominserter
CC
=
clang++
# compiling flags here
CFLAGS
=
-Icppsrc/ -I/usr/local/include -I
$(ICONCERT)
-I
$(ICPLEX)
-I
$(INUPACK)
-I
$(IEIGEN)
-
g
CFLAGS
=
-Icppsrc/ -I/usr/local/include -I
$(ICONCERT)
-I
$(ICPLEX)
-I
$(INUPACK)
-I
$(IEIGEN)
-
O3
CXXFLAGS
=
--std
=
c++17 -Wall -Wpedantic -Wextra -Wno-ignored-attributes -Wno-unused-variable
LINKER
=
clang++
...
...
cppsrc/MOIP.cpp
View file @
fc998ce
...
...
@@ -170,8 +170,8 @@ SecondaryStructure MOIP::solve_objective(int o, double min, double max)
}
if
(
verbose_
)
cout
<<
"
\t
>Solution status:
"
<<
cplex_
.
getStatus
()
<<
", with
objective values ("
<<
cplex_
.
getValue
(
obj1
)
<<
", "
<<
cplex_
.
getValue
(
obj2
)
<<
')'
<<
endl
;
cout
<<
"
\t
>Solution status: objective values ("
<<
cplex_
.
getValue
(
obj1
)
<<
", "
<<
cplex_
.
getValue
(
obj2
)
<<
')'
;
// Build a secondary Structure
SecondaryStructure
best_ss
=
SecondaryStructure
(
rna_
);
...
...
@@ -377,12 +377,12 @@ void MOIP::search_between(double lambdaMin, double lambdaMax)
// if the solution is dominated, ignore it
if
(
!
is_undominated_yet
(
s
))
{
if
(
verbose_
)
cout
<<
"
\t\t
>
structure is dominated."
<<
endl
;
if
(
verbose_
)
cout
<<
"
, but
structure is dominated."
<<
endl
;
return
;
}
// adding the SecondaryStructure s to the set pareto_
if
(
verbose_
)
cout
<<
"
\t\t
>
not dominated."
<<
endl
;
if
(
verbose_
)
cout
<<
"
,
not dominated."
<<
endl
;
add_solution
(
s
);
// check if some labels should be updated on the vertical
...
...
cppsrc/Motif.cpp
View file @
fc998ce
...
...
@@ -81,7 +81,7 @@ vector<Motif> Motif::build_from_desc(const string& descfile, string rna)
// Now create proper motifs
for
(
vector
<
Component
>&
v
:
vresults
)
{
results
.
push_back
(
Motif
(
v
,
descfile
.
substr
(
0
,
descfile
.
find
(
".desc"
)
)));
results
.
push_back
(
Motif
(
v
,
path
(
descfile
).
stem
().
string
(
)));
}
cout
<<
results
.
size
()
<<
" times"
<<
endl
;
return
results
;
...
...
cppsrc/biominserter.cpp
View file @
fc998ce
...
...
@@ -96,7 +96,6 @@ int main(int argc, char* argv[])
posInsertionSites
=
load_desc_folder
(
motifs_path_name
,
fa
->
seq
(),
verbose
);
if
(
verbose
)
cout
<<
"
\t
>"
<<
motifs_path_name
<<
" successfuly loaded ("
<<
posInsertionSites
.
size
()
<<
" insertion sites)"
<<
endl
;
exit
(
0
);
/* FIND PARETO SET */
...
...
Please
register
or
login
to post a comment