projects
/
mussa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
816d629
)
change from cout to clog in some commented out debugging messages.
author
Diane Trout
<diane@caltech.edu>
Wed, 9 Aug 2006 00:10:52 +0000
(
00:10
+0000)
committer
Diane Trout
<diane@caltech.edu>
Wed, 9 Aug 2006 00:10:52 +0000
(
00:10
+0000)
alg/mussa.cpp
patch
|
blob
|
history
diff --git
a/alg/mussa.cpp
b/alg/mussa.cpp
index 68e7324bea578bf7d41c6f7cf6b2ed2962261738..95a0a7daca91ec0564ddbbf55110c439b62749c2 100644
(file)
--- a/
alg/mussa.cpp
+++ b/
alg/mussa.cpp
@@
-594,12
+594,12
@@
Mussa::load(fs::path ana_file)
vector<FLPs> empty_FLP_vector;
FLPs dummy_comp;
vector<FLPs> empty_FLP_vector;
FLPs dummy_comp;
- //c
out
<< "ana_file name " << ana_file.string() << endl;
+ //c
log
<< "ana_file name " << ana_file.string() << endl;
analysis_name = ana_path.leaf();
analysis_name = ana_path.leaf();
- //c
out
<< " ana_name " << analysis_name << endl;
+ //c
log
<< " ana_name " << analysis_name << endl;
file_path_base = ana_path.branch_path() / analysis_name;
a_file_path = file_path_base / (analysis_name + ".muway");
file_path_base = ana_path.branch_path() / analysis_name;
a_file_path = file_path_base / (analysis_name + ".muway");
- //c
out
<< " loading museq: " << a_file_path.string() << endl;
+ //c
log
<< " loading museq: " << a_file_path.string() << endl;
the_paths.load(a_file_path);
// perhaps this could be more elegent, but at least this'll let
// us know what our threshold and window sizes were when we load a muway
the_paths.load(a_file_path);
// perhaps this could be more elegent, but at least this'll let
// us know what our threshold and window sizes were when we load a muway
@@
-615,7
+615,7
@@
Mussa::load(fs::path ana_file)
for (i = 1; i <= seq_num; i++)
{
boost::shared_ptr<Sequence> tmp_seq(new Sequence);
for (i = 1; i <= seq_num; i++)
{
boost::shared_ptr<Sequence> tmp_seq(new Sequence);
- //c
out
<< "mussa_class: loading museq frag... " << a_file_path.string() << endl;
+ //c
log
<< "mussa_class: loading museq frag... " << a_file_path.string() << endl;
tmp_seq->load_museq(a_file_path, i);
the_seqs.push_back(tmp_seq);
}
tmp_seq->load_museq(a_file_path, i);
the_seqs.push_back(tmp_seq);
}
@@
-634,11
+634,11
@@
Mussa::load(fs::path ana_file)
{
append_info.str("");
append_info << analysis_name << "_sp_" << i << "v" << i2 << ".flp";
{
append_info.str("");
append_info << analysis_name << "_sp_" << i << "v" << i2 << ".flp";
- //c
out
<< append_info.str() << endl;
+ //c
log
<< append_info.str() << endl;
a_file_path = file_path_base / append_info.str();
a_file_path = file_path_base / append_info.str();
- //c
out
<< "path " << a_file_path.string() << endl;
+ //c
log
<< "path " << a_file_path.string() << endl;
all_comps[i][i2].load(a_file_path);
all_comps[i][i2].load(a_file_path);
- //c
out
<< "real size = " << all_comps[i][i2].size() << endl;
+ //c
log
<< "real size = " << all_comps[i][i2].size() << endl;
}
}
}
}
}
}