Skip to content

Commit 4d496c5

Browse files
committed
Data loading stability patch
1 parent ce3c2ce commit 4d496c5

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/lib-base/src/MainTesterMT.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,17 @@ MainTesterMT::~MainTesterMT(){}
1616
VecUPtr<ISymbol> MainTesterMT::GetSymbols(const std::vector<TupleIn> & inp, bool multiThreaded)
1717
{
1818
CtplWrap<CorPtr<ISymbol>> ctpl;
19-
ctpl.GetCfgRW().SetMT(multiThreaded);
19+
ctpl.GetCfgRW().SetMT(multiThreaded); /// TODO: This appears to fail
20+
21+
if (not multiThreaded) /// Patch for the above
22+
{
23+
VecUPtr<ISymbol> ret;
24+
for (const TupleIn & tin : inp)
25+
{
26+
ret.push_back(EnjoLib::UniquePtr<ISymbol>((MainTester::GetSymbolStatic(0, Get<0>(tin), Get<1>(tin), Get<2>(tin)).release())));
27+
}
28+
return ret;
29+
}
2030

2131
for (const TupleIn & tin : inp)
2232
{

src/lib-base/src/OptimizerBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "OptiVar.h"
77
#include "OptiVarVec.h"
88
#include "IOptiSubject.h"
9-
#include "IOptiGoal.h"
9+
//#include "IOptiGoal.h"
1010
//#include "ProfitsCalc.h"
1111
//#include "GnuplotMan.h"
1212
#include "ConfigOpti.h"

0 commit comments

Comments
 (0)