diff --git a/MarketData/MarketData/Models/runcmmomentumbacktest.sh b/MarketData/MarketData/Models/runcmmomentumbacktest.sh
index 30dc99f..502d53a 100755
--- a/MarketData/MarketData/Models/runcmmomentumbacktest.sh
+++ b/MarketData/MarketData/Models/runcmmomentumbacktest.sh
@@ -9,7 +9,8 @@
export DOTNET_ROOT=/opt/dotnet
CNNDAYCOUNT=90
-VERSION=05
+#VERSION=05
+VERSION=06
USEMAXPOSITIONBUCKETWEIGHT=TRUE
USEMAXPOSITIONBUCKETWEIGHTMAXWEIGHT=.65
USEOVEREXTENDEDINDICATOR=TRUE
diff --git a/MarketData/MarketDataLib/CNNProcessing/DataProcessor.cs b/MarketData/MarketDataLib/CNNProcessing/DataProcessor.cs
index 86a7055..24d06dc 100755
--- a/MarketData/MarketDataLib/CNNProcessing/DataProcessor.cs
+++ b/MarketData/MarketDataLib/CNNProcessing/DataProcessor.cs
@@ -13,6 +13,7 @@ namespace MarketData.CNNProcessing
private readonly SKColor colorBlack = new SKColor(0,0,0);
private readonly SKColor colorWhite = new SKColor(255,255,255);
private readonly SKColor colorRed = new SKColor(255,0,0);
+ private readonly SKColor colorGreen = new SKColor(0,255,0);
public DataProcessor(int width=640,int height=480)
{
@@ -21,6 +22,7 @@ namespace MarketData.CNNProcessing
PenWidth=2f;
DrawingBrush = colorBlack;
DrawingBrushRed = colorRed;
+ DrawingBrushGreen = colorGreen;
FillBrush = colorWhite;
DrawPrice=true;
UseGrayScale=false;
@@ -66,6 +68,12 @@ namespace MarketData.CNNProcessing
///Gets/Sets the drawing brush brush
public SKColor DrawingBrushRed{get;set;}
+ ///
+ /// DrawingBrushGreen
+ ///
+ ///Gets/Sets the drawing brush brush
+ public SKColor DrawingBrushGreen{get;set;}
+
///
/// DrawBlack
///
@@ -323,8 +331,6 @@ namespace MarketData.CNNProcessing
float maxX=close.Length;
float minX=0.00f;
- // Pen pen=new Pen(DrawingBrush,penWidth);
- // Pen redPen=new Pen(DrawingBrushRed,penWidth);
ImageHelper imageHelper=new ImageHelper();
PointMapping pointMapping=new PointMapping(Width,Height,maxX,minX,maxY,minY);
@@ -338,10 +344,10 @@ namespace MarketData.CNNProcessing
if(DrawPrice)imageHelper.DrawSeries(DrawingBrush,penWidth,close);
// draw k
- imageHelper.DrawSeries(DrawingBrush,penWidth,k);
+ imageHelper.DrawSeries(DrawingBrushGreen,penWidth,k);
// draw l
- imageHelper.DrawSeries(DrawingBrush,penWidth,l);
+ imageHelper.DrawSeries(DrawingBrushGreen,penWidth,l);
if(0.00!=noise)imageHelper.AddNoise(NoiseColor,noise);
if(testCase.TypeOutput.Equals(TestCase.OutputType.OutputFile))