change dir structure

Makefile

@@ -1,17 +1,20 @@
 
-DUB=/usr/bin/dub
+DUB=dub # /usr/bin/dub
+
+SRC=source/talibd
+
 
 all:
-	make -B source/talib_func.d
-	$(DUB) build -q
-	./talibd
+	make -B $(SRC)/talib_func.d
+	$(DUB) test --build=unittest
+
 
 DPP=~/.dub/packages/dpp-0.4.2/dpp/bin/d++
 DPPFLAGS = --preprocess-only --hard-fail --include-path=/home/linuxbrew/.linuxbrew/Cellar/ta-lib/0.4.0/include/ta-lib --keep-d-files --compiler=ldmd2 #dmd #ldc2 #
 talib:
-	$(DPP) $(DPPFLAGS) source/talib.dpp
+	$(DPP) $(DPPFLAGS) $(SRC)/talib.dpp
 
-source/talib_func.d: source/talib_func.h
+$(SRC)/talib_func.d: $(SRC)/talib_func.h
 	cpp -P $< | sed 's/__NL__/\n/g' > $@
 
 clean:

README.md

@@ -35,7 +35,7 @@ just type `make` to run it:
 $ make
 ...
 
-$ ./talibd
+
 Run some tests
 prices.length=755
 test TA_MA

source/oo.d → source/talibd/oo.d

@@ -1,5 +1,7 @@
-import talib;
-import talibd;
+module talibd.oo;
+
+import talibd.talib;
+import talibd.talib_func;
 
 // oo wrapper
 

source/talibd/package.d

@@ -0,0 +1,5 @@
+module talibd;
+
+public import talibd.talib;       // raw D interface of C
+public import talibd.talib_func;  // simplified D func
+public import talibd.oo;          // D wrapper

source/talib.d → source/talibd/talib.d

@@ -1,3 +1,4 @@
+module talibd.talib;
 
 public import core.stdc.stdio;
 

source/talib_func.d → source/talibd/talib_func.d

@@ -1,6 +1,7 @@
+module talibd.talib_func;
 import std.math;
 import fluent.asserts;
-import talib;
+import talibd.talib;
 /+
 TA_RetCode TA_RSI( int startIdx,
                    int endIdx,
@@ -58,7 +59,7 @@ bool TA_MA(double[] inData , double[] outMA , int MA_optInTimePeriod=default_MA_
  } 
  outMA[0..lookback] = 0;
 
- auto r = talib.TA_MA(0, cast(int)(inData.length-1), inData.ptr, MA_optInTimePeriod,optInMAType, &begin, &num ,
+ auto r = talibd.talib.TA_MA(0, cast(int)(inData.length-1), inData.ptr, MA_optInTimePeriod,optInMAType, &begin, &num ,
  &(outMA[lookback])); 
 
  Assert.equal(lookback, begin); 
@@ -70,7 +71,7 @@ bool TA_MA(double[] inData , double[] outMA , int MA_optInTimePeriod=default_MA_
 
 /+ manual wrapper
 bool TA_RSI(double[] inData, double[] outRSI, int period=default_RSI_optInTimePeriod) {
-  auto r = talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, period, &begin, &num, &(outRSI[lookback]));
+  auto r = talibd.talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, period, &begin, &num, &(outRSI[lookback]));
 }
 +/
 immutable int default_RSI_optInTimePeriod = 14;
@@ -86,7 +87,7 @@ bool TA_RSI(double[] inData , double[] outRSI , int RSI_optInTimePeriod=default_
  } 
  outRSI[0..lookback] = 0;
 
- auto r = talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, RSI_optInTimePeriod, &begin, &num ,
+ auto r = talibd.talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, RSI_optInTimePeriod, &begin, &num ,
  &(outRSI[lookback])); 
 
  Assert.equal(lookback, begin); 
@@ -115,7 +116,7 @@ bool TA_MACD(double[] inData , double[] outMACD, double[] outMACDSignal, double[
  outMACDSignal[0..lookback] = 0;
  outMACDHist[0..lookback] = 0;
 
- auto r = talib.TA_MACD(0, cast(int)(inData.length-1), inData.ptr, optInFastPeriod,optInSlowPeriod,optInSignalPeriod, &begin, &num ,
+ auto r = talibd.talib.TA_MACD(0, cast(int)(inData.length-1), inData.ptr, optInFastPeriod,optInSlowPeriod,optInSignalPeriod, &begin, &num ,
  &(outMACD[lookback]),
  &(outMACDSignal[lookback]),
  &(outMACDHist[lookback])); 

source/talib_func.h → source/talibd/talib_func.h

@@ -1,8 +1,10 @@
+module talibd.talib_func;
+
 import std.math;
 
 import fluent.asserts;
 
-import talib;
+import talibd.talib;
 
 
 #define HEAD(x, ...) x
@@ -124,7 +126,7 @@ bool TA_FUNC(double[] inData FOR_EACH(DECL_ARRAY_TYPE, FUNC_OUTS) FOR_EACH(SPLIT
     return false; __NL__\
   } __NL__\
   FOR_EACH(INIT_OUTPUT, FUNC_OUTS) __NL__\
-  auto r = talib.TA_FUNC(0, cast(int)(inData.length-1), inData.ptr, FOR_EACH(SPLIT_THEN_TAKE_VAR, FUNC_INS) &begin, &num OUT_PARAMS(FUNC_OUTS)); __NL__\
+  auto r = talibd.talib.TA_FUNC(0, cast(int)(inData.length-1), inData.ptr, FOR_EACH(SPLIT_THEN_TAKE_VAR, FUNC_INS) &begin, &num OUT_PARAMS(FUNC_OUTS)); __NL__\
  __NL__\
   Assert.equal(lookback, begin);  /* RSI's start 0-data need to compare with prev close, so this assert holds; in contrast for TA_MA */ __NL__\
   Assert.equal(begin + num, cast(int)(inData.length)); __NL__\
@@ -147,7 +149,7 @@ DECL_TA_FUNC(TA_MA, MA_INS, MA_OUTS, (MA_optInTimePeriod-1))
 
 /+ manual wrapper
 bool TA_RSI(double[] inData, double[] outRSI, int period=default_RSI_optInTimePeriod) {
-  auto r = talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, period, &begin, &num, &(outRSI[lookback]));
+  auto r = talibd.talib.TA_RSI(0, cast(int)(inData.length-1), inData.ptr, period, &begin, &num, &(outRSI[lookback]));
 }
 +/
 

source/app.d → source/talibd/test.d

@@ -1,3 +1,5 @@
+module talibd.test;
+
 import std.algorithm;
 import std.csv;
 import std.experimental.logger;
@@ -7,11 +9,16 @@ import std.typecons;
 
 import fluent.asserts;
 public import jdiutil;
-import talibd;
+
+public import talibd.talib;       // raw D interface of C
+public import talibd.talib_func;  // simplified D func
+public import talibd.oo;          // D wrapper
 
 
 alias logger = std.experimental.logger;
 
+unittest {
+
 void main() {
   writeln("read test data");
   string fn = "testdata/SPY.csv";
@@ -114,3 +121,7 @@ void main() {
   assert(approxEqual(ema13[$-1], 340.794, maxRelDiff));
   }
 }
+
+main();
+
+}