Skip to content

Commit 48c3862

Browse files
committed
load user seqs
1 parent 5c66537 commit 48c3862

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/mine/mine_manager.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ void MineManager::load() {
9191
// lock released at the end of this block
9292
}
9393

94-
// TODO: load user sequences if user/stripped exists
94+
// load user sequences
95+
const auto user_home = SequenceUtil::getSeqsFolder('U');
96+
if (isFile(user_home + "stripped")) {
97+
loader.load(user_home, 'U');
98+
}
9599

96100
// check consistency
97101
loader.checkConsistency();

src/seq/seq_loader.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "sys/util.hpp"
1111

1212
void throwParseError(const std::string &line) {
13-
Log::get().error("Error parse line: " + line, true);
13+
Log::get().error("Error parsing line: " + line, true);
1414
}
1515

1616
SequenceLoader::SequenceLoader(SequenceIndex &index, size_t min_num_terms)
@@ -24,9 +24,13 @@ void SequenceLoader::load(std::string folder, char domain) {
2424
" with domain '" + std::string(1, domain) + "'");
2525
auto start_time = std::chrono::steady_clock::now();
2626

27+
auto new_loaded = num_loaded;
28+
auto new_total = num_total;
2729
loadData(folder, domain);
2830
loadNames(folder, domain);
2931
loadOffsets(folder, domain);
32+
new_loaded = num_loaded - new_loaded;
33+
new_total = num_total - new_total;
3034

3135
// print summary
3236
auto cur_time = std::chrono::steady_clock::now();
@@ -38,8 +42,8 @@ void SequenceLoader::load(std::string folder, char domain) {
3842
buf.setf(std::ios::fixed);
3943
buf.precision(2);
4044
buf << duration;
41-
Log::get().info("Loaded " + std::to_string(num_loaded) + "/" +
42-
std::to_string(num_total) + " " + std::string(1, domain) +
45+
Log::get().info("Loaded " + std::to_string(new_loaded) + "/" +
46+
std::to_string(new_total) + " " + std::string(1, domain) +
4347
"-sequences in " + buf.str() + "s");
4448
}
4549

0 commit comments

Comments
 (0)