Added maxPoolSize and minPoolSize

Author: CESARDELATORRE

samples/csharp/end-to-end-apps/Regression-SalesForecast/src/eShopDashboard/Forecast/MLModel.cs

@@ -14,9 +14,10 @@ public class MLModel<TData, TPrediction>
         private readonly ITransformer _model;
         private readonly ObjectPool<PredictionFunction<TData, TPrediction>> _predictionEnginePool;
         private readonly int _minPredictionEngineObjectsInPool;
+        private readonly int _maxPredictionEngineObjectsInPool;
 
         //Constructor with modelFilePathName to load
-        public MLModel(MLContext mlContext, string modelFilePathName, int minPredictionEngineObjectsInPool = 10)
+        public MLModel(MLContext mlContext, string modelFilePathName, int minPredictionEngineObjectsInPool = 10, int maxPredictionEngineObjectsInPool = 1000)
         {
             _mlContext = mlContext;
 
@@ -27,25 +28,29 @@ public MLModel(MLContext mlContext, string modelFilePathName, int minPredictionE
             }
 
             _minPredictionEngineObjectsInPool = minPredictionEngineObjectsInPool;
+            _maxPredictionEngineObjectsInPool = maxPredictionEngineObjectsInPool;
 
             //Create PredictionEngine Object Pool
             _predictionEnginePool = CreatePredictionEngineObjectPool();
         }
 
         //Constructor with ITransformer model already created
-        public MLModel(MLContext mlContext, ITransformer model, int minPredictionEngineObjectsInPool = 10)
+        public MLModel(MLContext mlContext, ITransformer model, int minPredictionEngineObjectsInPool = 10, int maxPredictionEngineObjectsInPool = 1000)
         {
             _mlContext = mlContext;
             _model = model;
             _minPredictionEngineObjectsInPool = minPredictionEngineObjectsInPool;
+            _maxPredictionEngineObjectsInPool = maxPredictionEngineObjectsInPool;
 
             //Create PredictionEngine Object Pool
             _predictionEnginePool = CreatePredictionEngineObjectPool();
         }
 
         private ObjectPool<PredictionFunction<TData, TPrediction>> CreatePredictionEngineObjectPool()
         {
-            return new ObjectPool<PredictionFunction<TData, TPrediction>>(() => _model.MakePredictionFunction<TData, TPrediction>(_mlContext), _minPredictionEngineObjectsInPool);
+            return new ObjectPool<PredictionFunction<TData, TPrediction>>(() => _model.MakePredictionFunction<TData, TPrediction>(_mlContext), 
+                                                                          _minPredictionEngineObjectsInPool, 
+                                                                          _maxPredictionEngineObjectsInPool);
         }
 
         public TPrediction Predict(TData dataSample)

samples/csharp/end-to-end-apps/Regression-SalesForecast/src/eShopDashboard/Forecast/ObjectPool.cs

@@ -10,18 +10,20 @@ public class ObjectPool<T>
     {
         private ConcurrentBag<T> _objects;
         private Func<T> _objectGenerator;
+        private int _maxPoolSize;
 
-        public ObjectPool(Func<T> objectGenerator, int minObjects = 5)
+        public ObjectPool(Func<T> objectGenerator, int minPoolSize = 5, int maxPoolSize = 5000)
         {
             if (objectGenerator == null) throw new ArgumentNullException("objectGenerator");
             _objects = new ConcurrentBag<T>();
             _objectGenerator = objectGenerator;
-          
+            _maxPoolSize = maxPoolSize;
+
             //Measure total time of minimum objects creation 
             var watch = System.Diagnostics.Stopwatch.StartNew();
 
             //Create minimum number of objects in pool
-            for (int i = 0; i < minObjects; i++)
+            for (int i = 0; i < minPoolSize; i++)
             {
                 _objects.Add(_objectGenerator());
             }
@@ -35,9 +37,16 @@ public T GetObject()
         {
             T item;
             if (_objects.TryTake(out item))
+            {
                 return item;
+            }
             else
-                return _objectGenerator();
+            {
+                if(_objects.Count <= _maxPoolSize)
+                    return _objectGenerator();
+                else
+                    throw new InvalidOperationException("MaxPoolSize reached");
+            }
         }
 
         public void PutObject(T item)

samples/csharp/end-to-end-apps/Regression-SalesForecast/src/eShopDashboard/Startup.cs

@@ -61,7 +61,7 @@ public void ConfigureServices(IServiceCollection services)
                 MLContext mlContext = ctx.GetRequiredService<MLContext>();
                 string modelFolder = Configuration["ForecastModelsPath"];
                 string modelFilePathName = $"{modelFolder}/country_month_fastTreeTweedie.zip";
-                return new MLModel<CountryData, CountrySalesPrediction>(mlContext, modelFilePathName, minPredictionEngineObjectsInPool:15);
+                return new MLModel<CountryData, CountrySalesPrediction>(mlContext, modelFilePathName, minPredictionEngineObjectsInPool:50);
             });
 
             services.Configure<CatalogSettings>(Configuration.GetSection("CatalogSettings"));