Skip to content

Commit 65b0bf6

Browse files
ckrauseckrause
committed
refactor managed seq
1 parent 6825786 commit 65b0bf6

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎src/cmd/commands.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ void Commands::testPari(const std::string& test_id) {
626626
}
627627

628628
// determine number of terms for testing
629-
size_t numTerms = seq.existingNumTerms();
629+
size_t numTerms = seq.numExistingTerms();
630630
if (inceval.init(program)) {
631631
const int64_t targetTerms = 15 * inceval.getLoopCounterDecrement();
632632
numTerms = std::min<size_t>(numTerms, targetTerms);
@@ -699,7 +699,7 @@ bool checkRange(const ManagedSequence& seq, const Program& program,
699699
bool finiteInput) {
700700
auto idStr = seq.id.string();
701701
auto offset = ProgramUtil::getOffset(program);
702-
auto numTerms = seq.existingNumTerms();
702+
auto numTerms = seq.numExistingTerms();
703703
auto terms = seq.getTerms(numTerms);
704704
Number inputUpperBound = finiteInput ? offset + numTerms - 1 : Number::INF;
705705
RangeGenerator generator;

‎src/mine/finder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void Finder::findAll(const Program &p, const Sequence &norm_seq,
117117
continue;
118118
}
119119
last = t;
120-
auto expected_seq = s.getTerms(s.existingNumTerms());
120+
auto expected_seq = s.getTerms(s.numExistingTerms());
121121
auto num_required = OeisProgram::getNumRequiredTerms(t.second);
122122
auto res = evaluator.check(t.second, expected_seq, num_required, t.first);
123123
if (res.first == status_t::ERROR) {

‎src/oeis/oeis_manager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ void OeisManager::dumpProgram(UID id, Program &p, const std::string &file,
578578
const auto &seq = sequences.get(id);
579579
Program tmp;
580580
Operation nop(Operation::Type::NOP);
581-
nop.comment = seq.to_string();
581+
nop.comment = seq.string();
582582
tmp.ops.push_back(nop);
583583
if (!submitted_by.empty()) {
584584
nop.comment = Comments::PREFIX_SUBMITTED_BY + " " + submitted_by;
@@ -614,7 +614,7 @@ void OeisManager::alert(Program p, UID id, const std::string &prefix,
614614
const std::string &submitted_by) const {
615615
const auto &seq = sequences.get(id);
616616
std::string msg, full;
617-
msg = prefix + " program for " + seq.to_string();
617+
msg = prefix + " program for " + seq.string();
618618
full = msg + " Terms: " + seq.getTerms(settings.num_terms).to_string();
619619
FormulaGenerator generator;
620620
Formula formula;
@@ -777,7 +777,7 @@ bool OeisManager::maintainProgram(UID id, bool eval) {
777777
Program program;
778778
std::string submitted_by;
779779
if (is_okay) {
780-
Log::get().info("Checking program for " + s.to_string());
780+
Log::get().info("Checking program for " + s.string());
781781
try {
782782
program = parser.parse(program_file);
783783
submitted_by =

‎src/seq/managed_sequence.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ std::ostream& operator<<(std::ostream& out, const ManagedSequence& s) {
2727
return out;
2828
}
2929

30-
std::string ManagedSequence::to_string() const {
30+
std::string ManagedSequence::string() const {
3131
std::stringstream ss;
3232
ss << (*this);
3333
return ss.str();

‎src/seq/managed_sequence.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class ManagedSequence {
1111
public:
12-
ManagedSequence(UID id = UID('A', 0));
12+
ManagedSequence(UID id = UID());
1313

1414
ManagedSequence(UID id, const std::string& name, const Sequence& full);
1515

@@ -18,15 +18,15 @@ class ManagedSequence {
1818
Sequence getTerms(
1919
int64_t max_num_terms = SequenceUtil::EXTENDED_SEQ_LENGTH) const;
2020

21-
size_t existingNumTerms() const { return terms.size(); }
21+
size_t numExistingTerms() const { return terms.size(); }
2222

23-
UID id;
24-
std::string name;
25-
int64_t offset;
23+
std::string string() const;
2624

2725
friend std::ostream& operator<<(std::ostream& out, const ManagedSequence& s);
2826

29-
std::string to_string() const;
27+
UID id;
28+
std::string name;
29+
int64_t offset;
3030

3131
private:
3232
mutable Sequence terms;

‎src/seq/sequence_loader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void SequenceLoader::checkConsistency() const {
199199
Log::get().debug("Checking sequence data consistency");
200200
size_t num_seqs = 0, num_names = 0;
201201
for (const auto &s : index) {
202-
Log::get().debug("Checking consistency of " + s.to_string());
202+
Log::get().debug("Checking consistency of " + s.string());
203203
if (s.id.empty()) {
204204
Log::get().error("Empty sequence ID", true);
205205
}
@@ -209,9 +209,9 @@ void SequenceLoader::checkConsistency() const {
209209
} else {
210210
num_names++;
211211
}
212-
if (s.existingNumTerms() < min_num_terms) {
212+
if (s.numExistingTerms() < min_num_terms) {
213213
Log::get().error("Not enough terms for sequence " + s.id.string() + " (" +
214-
std::to_string(s.existingNumTerms()) + "<" +
214+
std::to_string(s.numExistingTerms()) + "<" +
215215
std::to_string(min_num_terms) + ")",
216216
true);
217217
}

0 commit comments

Comments
 (0)