Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/lib-base/src/PeriodClean.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,15 @@ void PeriodClean::Feed(const EnjoLib::IIterableConst<Tick> & ticks, bool updateT

void PeriodClean::Feed(const Tick & tick, bool updateTech)
{
const double prevClose = m_tickMod.close;
m_tickMod = tick;
if (prevClose != 0)
{
m_tickMod.open = prevClose;
}
if (not tick.IsValid())
return;
m_currCandle.UpdateHighLow(tick); // Valid every time
m_currCandle.UpdateHighLow(m_tickMod); // used to be tick, but it messed up the opening of the next candle
++m_currTick;

int tickDayMinutes = tick.GetDayMinute();
Expand Down Expand Up @@ -151,6 +156,7 @@ void PeriodClean::Feed(const Tick & tick, bool updateTech)
tickDayMinutes = m_tickMod.GetDayMinute();
}
if (tickDayMinutes % m_numTicks == 0 ) // A full period achieved
//if (true ) // A full period achieved
{
FinalizeCandlePriv(updateTech);
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib-base/src/PredictorRegression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ PredictorRegression::~PredictorRegression(){}
EnjoLib::VecD PredictorRegression::Predict(const EnjoLib::VecD & data, size_t idx, int horizon) const
{
EnjoLib::Regression reg;
const int degree = 2;
const int numSamples = 3;
const int degree = 1;
const int numSamples = 4;
EnjoLib::VecD vdx;
EnjoLib::VecD vdy;

Expand Down
2 changes: 1 addition & 1 deletion src/lib-base/src/TicksProviderXMR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <Ios/Osstream.hpp>
#include <Util/Str.hpp>
#include <Util/Tokenizer.hpp>
#include <Template/LoopThreadedTpl.hpp>
//#include <Template/LoopThreadedTpl.hpp>

using namespace std;
using namespace EnjoLib;
Expand Down
12 changes: 1 addition & 11 deletions tests/test-base/src/StrategyFactoryNameTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@ static StrategyFactoryName sfn;
// Exceptions mess up debugging sessions
TEST(StrategyFactoryName_nonExisting_throws)
{
const bool expected = false;
try
{
sfn.NameToType("Nonexisting");
CHECK_EQUAL(expected, true);
}
catch (std::exception & ex)
{
// Should throw
CHECK_EQUAL(expected, false);
}
CHECK_THROW(sfn.NameToType("Nonexisting"), std::exception);
}
#endif

Expand Down