Merge pull request #311 from SamSmithNZ-dotcom/AddingJellyBeans

Added JellyBeans

Author: samsmithnz

src/MandMCounter.Core/Calculator.cs

@@ -30,6 +30,12 @@ public static float CountSkittles(string unit, float quantity)
             return numberOfMandMs;
         }
 
+        public static float CountJellyBeans(string unit, float quantity)
+        {
+            float numberOfJellyBeans = GetCubicCmForVolume(unit, quantity) * Constants.JellyBeansDensityPercent / Constants.JellyBeansVolumeCubicCm;
+            return numberOfJellyBeans;
+        }
+
         /// <summary>
         /// To count the number of M&Ms in a container based on rectangular container
         /// </summary>
@@ -56,6 +62,12 @@ public static float CountSkittles(string unit, float height, float width, float
             return numberOfMandMs;
         }
 
+        public static float CountJellyBeans(string unit, float height, float width, float length)
+        {
+            float numberOfJellyBeans = GetCubicCmForRectangle(unit, height, width, length) * Constants.JellyBeansDensityPercent / Constants.JellyBeansVolumeCubicCm;
+            return numberOfJellyBeans;
+        }
+
         /// <summary>
         /// To count the number of M&Ms in a container based on rectangular container
         /// </summary>
@@ -81,6 +93,12 @@ public static float CountSkittles(string unit, float height, float radius)
             return numberOfMandMs;
         }
 
+        public static float CountJellyBeans(string unit, float height, float radius)
+        {
+            float numberOfJellyBeans = GetCubicCmForCylinder(unit, height, radius) * Constants.JellyBeansDensityPercent / Constants.JellyBeansVolumeCubicCm;
+            return numberOfJellyBeans;
+        }
+
         private static float GetCubicCmForVolume(string unit, float quantity)
         {
             if (string.IsNullOrEmpty(unit))

src/MandMCounter.Core/Constants.cs

@@ -11,6 +11,8 @@ public class Constants
         //Reference: this one thinks it's 0.625f http://www.answers.com/Q/What_is_a_volume_of_one_skittle
         //Reference 2: this one thinks it's  0.7418629f https://community.babycenter.com/post/a37375396/guess_how_many_skittles?cpg=2
         public const float SkittlesVolumeCubicCm = 0.7418629f; //Going with the bigger number, as skittles are bigger than M&Ms
+        //Reference: Volume of a jellybean is 3.5325, so the volume in one cubic CM is 1/3.5325 = 0.2831
+        public const float JellyBeansVolumeCubicCm = 0.2831f;
 
         //Reference: https://yenra.com/particle-packing/
         //Some people think this is 68.5%. https://cims.nyu.edu/~donev/Thesis.pdf
@@ -19,6 +21,8 @@ public class Constants
         public const float PeanutMandMSDensityPercent = 0.64f;
         //Reference: https://community.babycenter.com/post/a37375396/guess_how_many_skittles?cpg=2
         public const float SkittlesDensityPercent = 0.665f; //This feels right too, as skittles are more round than an M&M
+        //Reference: https://www.pearson.com/channels/physics/asset/9b2fde72/ii-estimate-the-number-of-jelly-beans-in-the-jar-of-fig-113-and-ltimage-and-gt
+        public const float JellyBeansDensityPercent = 0.64f;
 
         //Conversions done using Google conversion calculater
         public const float USGallonToCubicCM = 3785.4119997685f;

src/MandMCounter.MCP/Tools.cs

@@ -45,6 +45,20 @@ public class SkittleCounterTool
         public static float GetDataForCylinder(string unit, float height, float radius) => Calculator.CountSkittles(unit, height, radius);
     }
 
+    // MCP tool for Jelly Bean counting
+    [McpServerToolType]
+    public class JellyBeanCounterTool
+    {
+        [McpServerTool]
+        public static float GetDataForUnit(string unit, float quantity) => Calculator.CountJellyBeans(unit, quantity);
+
+        [McpServerTool]
+        public static float GetDataForRectangle(string unit, float height, float width, float length) => Calculator.CountJellyBeans(unit, height, width, length);
+
+        [McpServerTool]
+        public static float GetDataForCylinder(string unit, float height, float radius) => Calculator.CountJellyBeans(unit, height, radius);
+    }
+
     // MCP tool for units
     [McpServerToolType]
     public class UnitsTool

src/MandMCounter.Service/Controllers/JellyBeanCounterController.cs

@@ -0,0 +1,28 @@
+using MandMCounter.Core;
+using Microsoft.AspNetCore.Mvc;
+
+namespace MandMCounter.Service.Controllers
+{
+    [Produces("application/json")]
+    [Route("api/JellyBeanCounter")]
+    public class JellyBeanCounterController : Controller
+    {
+        [HttpGet("GetDataForUnit")]
+        public float GetDataForUnit(string unit, float quantity)
+        {
+            return Calculator.CountJellyBeans(unit, quantity);
+        }
+
+        [HttpGet("GetDataForRectangle")]
+        public float GetDataForRectangle(string unit, float height, float width, float length)
+        {
+            return Calculator.CountJellyBeans(unit, height, width, length);
+        }
+
+        [HttpGet("GetDataForCylinder")]
+        public float GetDataForCylinder(string unit, float height, float radius)
+        {
+            return Calculator.CountJellyBeans(unit, height, radius);
+        }
+    }
+}

src/MandMCounter.Service/Program.cs

@@ -1,5 +1,6 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace MandMCounter.Service
 {
@@ -8,13 +9,14 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseApplicationInsights()
-                .UseStartup<Startup>()
-                .Build();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }

src/MandMCounter.Service/Startup.cs

@@ -23,6 +23,8 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddApplicationInsightsTelemetry();
+            
             services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin()
                                                                                 .AllowAnyMethod()
                                                                                 .AllowAnyHeader()));

src/MandMCounter.Tests/Controllers/JellyBeanControllerTests.cs

@@ -0,0 +1,160 @@
+using MandMCounter.Service.Controllers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MandMCounter.Tests.Controllers
+{
+    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    [TestClass]
+    public class JellyBeanControllerTests
+    {
+        private JellyBeanCounterController _controller;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            _controller = new JellyBeanCounterController();
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInAUSGallonTest()
+        {
+            //Arrange
+            string unit = "Gallon";
+            float quantity = 1f;
+            const float expectedJellyBeans = 8558f;
+
+            //Act
+            float result = _controller.GetDataForUnit(unit, quantity);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInAUSQuartTest()
+        {
+            //Arrange
+            string unit = "Quart";
+            float quantity = 1f;
+            const float expectedJellyBeans = 2140f;
+
+            //Act
+            float result = _controller.GetDataForUnit(unit, quantity);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInAUSCupTest()
+        {
+            //Arrange
+            string unit = "Cup";
+            float quantity = 1f;
+            const float expectedJellyBeans = 535f;
+
+            //Act
+            float result = _controller.GetDataForUnit(unit, quantity);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInAUSTableSpoonTest()
+        {
+            //Arrange
+            string unit = "Tablespoon";
+            float quantity = 1f;
+            const float expectedJellyBeans = 34f;
+
+            //Act
+            float result = _controller.GetDataForUnit(unit, quantity);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInALiterTest()
+        {
+            //Arrange
+            string unit = "Liter";
+            float quantity = 1f;
+            const float expectedJellyBeans = 2261f;
+
+            //Act
+            float result = _controller.GetDataForUnit(unit, quantity);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInA1CubicCMTest()
+        {
+            //Arrange
+            string unit = "cm";
+            float height = 10;
+            float width = 10;
+            float length = 10;
+            const float expectedJellyBeans = 2261f;
+
+            //Act
+            float result = _controller.GetDataForRectangle(unit, height, width, length);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInA1CubicInchTest()
+        {
+            //Arrange
+            string unit = "inch";
+            float height = 1;
+            float width = 1;
+            float length = 1;
+            const float expectedJellyBeans = 38f;
+
+            //Act
+            float result = _controller.GetDataForRectangle(unit, height, width, length);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInACylinderWithCMTest()
+        {
+            //Arrange
+            string unit = "cm";
+            float height = 10;
+            float radius = 5;
+            const float expectedJellyBeans = 1776f;
+
+            //Act
+            float result = _controller.GetDataForCylinder(unit, height, radius);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+        [TestMethod]
+        public void ControllerCountJellyBeansInACylinderWithInchTest()
+        {
+            //Arrange
+            string unit = "inch";
+            float height = 4;
+            float radius = 2;
+            const float expectedJellyBeans = 1863f;
+
+            //Act
+            float result = _controller.GetDataForCylinder(unit, height, radius);
+
+            //Assert
+            Assert.IsLessThan(expectedJellyBeans, result);
+        }
+
+    }
+}

src/MandMCounter.Tests/Controllers/MandMControllerTests.cs

@@ -1,14 +1,19 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MandMCounter.Service.Controllers;
-using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MandMCounter.Tests.Controllers
 {
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
     [TestClass]
     public class MandMControllerTests
     {
-        #region "Testing units"
+        private MandMCounterController _controller;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            _controller = new();
+        }
 
         [TestMethod]
         public void ControllerCountMandMsInAUSGallonTest()
@@ -18,17 +23,12 @@ public void ControllerCountMandMsInAUSGallonTest()
             float quantity = 1f;
 
             //Act
-            MandMCounterController controller = new MandMCounterController();
-            float result = controller.GetDataForUnit(unit, quantity);
+            float result = _controller.GetDataForUnit(unit, quantity);
 
             //Assert
-            Assert.IsTrue(Math.Abs(System.Math.Round(result, 0) - 253f) < 0.5);
+            Assert.IsLessThan(253f, result);
         }     
 
-        #endregion
-
-        #region " Testing volume in a rectangle" 
-
         [TestMethod]
         public void ControllerCountMandMsInA1CubicCMTest()
         {
@@ -37,36 +37,30 @@ public void ControllerCountMandMsInA1CubicCMTest()
             float height = 10;
             float width = 10;
             float length = 10;
+            const float expectedMandMs = 1070f;
 
             //Act
-            MandMCounterController controller = new MandMCounterController();
-            float result = controller.GetDataForRectangle(unit, height, width, length);
+            float result = _controller.GetDataForRectangle(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(Math.Abs(System.Math.Round(result, 0) - 1069f) < 0.5);
+            Assert.IsLessThan(expectedMandMs, result);
         }        
 
-        #endregion
-
-        #region " Testing volume in a cylinder" 
-
         [TestMethod]
         public void ControllerCountMandMsInACylinderWithCMTest()
         {
             //Arrange
             string unit = "cm";
             float height = 10;
             float radius = 5;
+            const float expectedMandMs = 840f;
 
             //Act
-            MandMCounterController controller = new MandMCounterController();
-            float result = controller.GetDataForCylinder(unit, height, radius);
+            float result = _controller.GetDataForCylinder(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(Math.Abs(System.Math.Round(result, 0) - 840f) < 0.5);
+            Assert.IsLessThan(expectedMandMs, result);
         }      
 
-        #endregion
-
     }
 }