diff --git a/MarketDataLib/Generator/CMMomentum/CMCandidate.cs b/MarketDataLib/Generator/CMMomentum/CMCandidate.cs index 54c0f4b..26304cf 100644 --- a/MarketDataLib/Generator/CMMomentum/CMCandidate.cs +++ b/MarketDataLib/Generator/CMMomentum/CMCandidate.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace MarketData.Generator.CMMomentum { diff --git a/MarketDataLib/Generator/CMMomentum/CMCandidateGenerator.cs b/MarketDataLib/Generator/CMMomentum/CMCandidateGenerator.cs index 824d84c..57bf8d7 100644 --- a/MarketDataLib/Generator/CMMomentum/CMCandidateGenerator.cs +++ b/MarketDataLib/Generator/CMMomentum/CMCandidateGenerator.cs @@ -6,8 +6,6 @@ using MarketData.Utils; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace MarketData.Generator.CMMomentum { diff --git a/MarketDataLib/Generator/CMMomentum/CMMomentumGenerator.cs b/MarketDataLib/Generator/CMMomentum/CMMomentumGenerator.cs index 48c3cfc..5a6008a 100644 --- a/MarketDataLib/Generator/CMMomentum/CMMomentumGenerator.cs +++ b/MarketDataLib/Generator/CMMomentum/CMMomentumGenerator.cs @@ -129,13 +129,13 @@ namespace MarketData.Generator.CMMomentum dataProcessor.Height=128; dataProcessor.PenWidth=1; TestCase testCase=new TestCase(cmCandidate.Symbol,cmCandidate.TradeDate,cmParams.UseCNNDayCount,TestCase.CaseType.Test,TestCase.GenerateType.BollingerBand,TestCase.OutputType.OutputStream); - dataProcessor.ProcessData(testCase); - String prediction = cnnClient.Predict(CNNClient.Model.resnet50,testCase.LastStream); + dataProcessor.ProcessData(testCase); +// String prediction = cnnClient.Predict(CNNClient.Model.resnet50,testCase.LastStream); + String prediction = cnnClient.Predict(CNNClient.Model.resnet50_20241024_270,testCase.LastStream); prediction=prediction.Substring(prediction.IndexOf("-->")); int result=int.Parse(Utility.BetweenString(prediction,"[[","]")); if(1==result) { -// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("PredictCandidate: Found positive convolutional model match for {0} on {1}. Score {2} -> {3}",cmCandidate.Symbol,cmCandidate.TradeDate.ToShortDateString(),cmCandidate.Score,cmCandidate.Score*(1.00+cmParams.UseCNNRewardPercentDecimal))); cmCandidate.Score*=(1.00+cmParams.UseCNNRewardPercentDecimal); // increase the score by the percentage indicated in the params settings cmCandidate.CNNPrediction=true; }