diff --git a/src/client/spark_historical/Analyzers/AlgoAnalyzer.cs b/src/client/spark_historical/Analyzers/AlgoAnalyzer.cs index 1b2dc2601..08741db9e 100644 --- a/src/client/spark_historical/Analyzers/AlgoAnalyzer.cs +++ b/src/client/spark_historical/Analyzers/AlgoAnalyzer.cs @@ -43,7 +43,7 @@ namespace bts.history for(int i = 0; i < hist.BucketCount; i++) { var buck = hist[i]; - var matching_model = new FIFOModel(_shared_order_book, buck); + var matching_model = new FIFOMatchingModel(_shared_order_book, buck); var algo = AlgoBase.algo_factory(algotype, matching_model, _security_list, algo_params); _algos.Add(buck, new AlgoStatsWrapper( algo, _shared_order_book, options ) ); activate_algo(algo); diff --git a/src/client/spark_historical/FillModel/FIFOModel.cs b/src/client/spark_historical/Model/FIFOMatchingModel.cs similarity index 94% rename from src/client/spark_historical/FillModel/FIFOModel.cs rename to src/client/spark_historical/Model/FIFOMatchingModel.cs index 8fbfca4bd..a9c6e480a 100644 --- a/src/client/spark_historical/FillModel/FIFOModel.cs +++ b/src/client/spark_historical/Model/FIFOMatchingModel.cs @@ -9,7 +9,7 @@ using MathNet.Numerics.Statistics; namespace bts.history { - public class FIFOModel : IMatchingModel + public class FIFOMatchingModel : IMatchingModel { IDictionary _books = new Dictionary(); @@ -18,7 +18,7 @@ namespace bts.history Dictionary> _cancel = new Dictionary>(); public Bucket latency_bucket { get; } - public FIFOModel(Bucket latency) + public FIFOMatchingModel(Bucket latency) { this.latency_bucket = latency; } @@ -33,7 +33,7 @@ namespace bts.history } } - public FIFOModel(IDictionary obs, Bucket latency_us) + public FIFOMatchingModel(IDictionary obs, Bucket latency_us) { this.latency_bucket = latency_us; foreach(var val in obs) diff --git a/src/client/spark_historical/FillModel/FillEntry.cs b/src/client/spark_historical/Model/FillEntry.cs similarity index 100% rename from src/client/spark_historical/FillModel/FillEntry.cs rename to src/client/spark_historical/Model/FillEntry.cs diff --git a/src/client/spark_historical/FillModel/IFillModel.cs b/src/client/spark_historical/Model/IMatchingModel.cs similarity index 100% rename from src/client/spark_historical/FillModel/IFillModel.cs rename to src/client/spark_historical/Model/IMatchingModel.cs diff --git a/src/client/spark_historical/FillModel/MBOBook.cs b/src/client/spark_historical/Model/MBOBook.cs similarity index 100% rename from src/client/spark_historical/FillModel/MBOBook.cs rename to src/client/spark_historical/Model/MBOBook.cs diff --git a/src/client/spark_historical/FillModel/MBOUtils.cs b/src/client/spark_historical/Model/MBOUtils.cs similarity index 100% rename from src/client/spark_historical/FillModel/MBOUtils.cs rename to src/client/spark_historical/Model/MBOUtils.cs diff --git a/src/client/spark_historical/FillModel/NullModel.cs b/src/client/spark_historical/Model/NullMatchingModel.cs similarity index 94% rename from src/client/spark_historical/FillModel/NullModel.cs rename to src/client/spark_historical/Model/NullMatchingModel.cs index c86ca3565..e9f7df52e 100644 --- a/src/client/spark_historical/FillModel/NullModel.cs +++ b/src/client/spark_historical/Model/NullMatchingModel.cs @@ -10,13 +10,13 @@ using mbts.co2; namespace bts.history { - public class NullModel : IMatchingModel + public class NullMatchingModel : IMatchingModel { IDictionary _books = new Dictionary(); Dictionary _orders = new Dictionary(); public Bucket latency_bucket { get; } - public NullModel(Bucket latency) + public NullMatchingModel(Bucket latency) { this.latency_bucket = latency; } diff --git a/src/client/spark_historical/FillModel/OrderEntry.cs b/src/client/spark_historical/Model/OrderEntry.cs similarity index 100% rename from src/client/spark_historical/FillModel/OrderEntry.cs rename to src/client/spark_historical/Model/OrderEntry.cs diff --git a/src/client/spark_historical/FillModel/OrderStatus.cs b/src/client/spark_historical/Model/OrderStatus.cs similarity index 100% rename from src/client/spark_historical/FillModel/OrderStatus.cs rename to src/client/spark_historical/Model/OrderStatus.cs diff --git a/src/client/spark_historical/Query/Query.cs b/src/client/spark_historical/Query/Query.cs index 72d5aa0f3..175061827 100644 --- a/src/client/spark_historical/Query/Query.cs +++ b/src/client/spark_historical/Query/Query.cs @@ -185,7 +185,7 @@ namespace bts.history var q = new List(); IAlgo algo = null; - int count = 0; var matching_model = new NullModel(new Bucket(latency, latency +1)); + int count = 0; var matching_model = new NullMatchingModel(new Bucket(latency, latency +1)); var ienum = stream_data(datastream, (T[] valcache, int min) => { q.Clear();