Skip to content

Commit dffe272

Browse files
authored
refactor log (#165)
1 parent 3ec369c commit dffe272

34 files changed

+254
-217
lines changed

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ifdef LODA_PLATFORM
88
CXXFLAGS += -DLODA_PLATFORM=$(LODA_PLATFORM)
99
endif
1010

11-
OBJS = api_client.o benchmark.o big_number.o blocks.o boinc.o commands.o config.o distribution.o evaluator.o evaluator_inc.o extender.o external/jute.o file.o finder.o generator.o generator_v1.o generator_v2.o generator_v3.o generator_v4.o generator_v5.o generator_v6.o generator_v7.o interpreter.o iterator.o main.o matcher.o memory.o metrics.o miner.o minimizer.o mutator.o number.o oeis_list.o oeis_manager.o oeis_sequence.o optimizer.o parser.o process.o program.o program_util.o reducer.o semantics.o setup.o sequence.o stats.o test.o util.o web_client.o
11+
OBJS = api_client.o benchmark.o big_number.o blocks.o boinc.o commands.o config.o distribution.o evaluator.o evaluator_inc.o extender.o external/jute.o file.o finder.o generator.o generator_v1.o generator_v2.o generator_v3.o generator_v4.o generator_v5.o generator_v6.o generator_v7.o interpreter.o iterator.o log.o main.o matcher.o memory.o metrics.o miner.o minimizer.o mutator.o number.o oeis_list.o oeis_manager.o oeis_sequence.o optimizer.o parser.o process.o program.o program_util.o reducer.o semantics.o setup.o sequence.o stats.o test.o util.o web_client.o
1212

1313
loda: external/jute.h external/jute.cpp $(OBJS)
1414
$(CXX) $(LDFLAGS) -o loda $(OBJS)

src/Makefile.windows.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CXXFLAGS = $(CXXFLAGS) /Z7
1010
CXXFLAGS = $(CXXFLAGS) /DLODA_PLATFORM=$(LODA_PLATFORM)
1111
!ENDIF
1212

13-
SRCS = api_client.cpp benchmark.cpp big_number.cpp blocks.cpp boinc.cpp commands.cpp config.cpp distribution.cpp evaluator.cpp evaluator_inc.cpp extender.cpp external/jute.cpp file.cpp finder.cpp generator.cpp generator_v1.cpp generator_v2.cpp generator_v3.cpp generator_v4.cpp generator_v5.cpp generator_v6.cpp generator_v7.cpp interpreter.cpp iterator.cpp main.cpp matcher.cpp memory.cpp metrics.cpp miner.cpp minimizer.cpp mutator.cpp number.cpp oeis_list.cpp oeis_manager.cpp oeis_sequence.cpp optimizer.cpp parser.cpp process.cpp program.cpp program_util.cpp reducer.cpp semantics.cpp sequence.cpp setup.cpp stats.cpp test.cpp util.cpp web_client.cpp
13+
SRCS = api_client.cpp benchmark.cpp big_number.cpp blocks.cpp boinc.cpp commands.cpp config.cpp distribution.cpp evaluator.cpp evaluator_inc.cpp extender.cpp external/jute.cpp file.cpp finder.cpp generator.cpp generator_v1.cpp generator_v2.cpp generator_v3.cpp generator_v4.cpp generator_v5.cpp generator_v6.cpp generator_v7.cpp interpreter.cpp iterator.cpp log.cpp main.cpp matcher.cpp memory.cpp metrics.cpp miner.cpp minimizer.cpp mutator.cpp number.cpp oeis_list.cpp oeis_manager.cpp oeis_sequence.cpp optimizer.cpp parser.cpp process.cpp program.cpp program_util.cpp reducer.cpp semantics.cpp sequence.cpp setup.cpp stats.cpp test.cpp util.cpp web_client.cpp
1414

1515
loda: external/jute.h external/jute.cpp $(SRCS)
1616
cl /EHsc /Feloda.exe $(CXXFLAGS) $(SRCS)

src/api_client.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <thread>
55

66
#include "file.hpp"
7+
#include "log.hpp"
78
#include "parser.hpp"
89
#include "program_util.hpp"
910
#include "setup.hpp"

src/benchmark.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
#include "evaluator.hpp"
66
#include "evaluator_inc.hpp"
7+
#include "log.hpp"
78
#include "oeis_sequence.hpp"
89
#include "parser.hpp"
910
#include "program_util.hpp"
1011
#include "setup.hpp"
11-
#include "util.hpp"
1212

1313
void Benchmark::all() {
1414
operations();

src/boinc.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "api_client.hpp"
77
#include "file.hpp"
8+
#include "log.hpp"
89
#include "miner.hpp"
910

1011
Boinc::Boinc(const Settings& settings) : settings(settings) {}

src/commands.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "boinc.hpp"
77
#include "evaluator.hpp"
88
#include "iterator.hpp"
9+
#include "log.hpp"
910
#include "miner.hpp"
1011
#include "minimizer.hpp"
1112
#include "mutator.hpp"

src/config.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "file.hpp"
44
#include "jute.h"
5+
#include "log.hpp"
56
#include "setup.hpp"
67

78
bool ConfigLoader::MAINTAINANCE_MODE = false;

src/evaluator.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include <sstream>
44

5+
#include "log.hpp"
6+
57
steps_t::steps_t() : min(0), max(0), total(0), runs(0) {}
68

79
void steps_t::add(size_t s) {

src/file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdexcept>
1212
#include <thread>
1313

14-
#include "util.hpp"
14+
#include "log.hpp"
1515

1616
// must be before <psapi.h>
1717
#ifdef _WIN64

src/finder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
#include "config.hpp"
88
#include "file.hpp"
9+
#include "log.hpp"
910
#include "number.hpp"
1011
#include "oeis_list.hpp"
1112
#include "oeis_sequence.hpp"
1213
#include "program_util.hpp"
1314
#include "setup.hpp"
14-
#include "util.hpp"
1515

1616
Finder::Finder(const Settings &settings, Evaluator &evaluator)
1717
: settings(settings),

0 commit comments

Comments
 (0)