Refactor

bartimaeusnek · Jul 5, 2020 · 47b1b18 · 47b1b18
1 parent 5c5dcbe
commit 47b1b18
Show file tree

Hide file tree

Showing 10 changed files with 178 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,7 @@ CropApp/bin/
 CropApp/obj/
 Debug/
 /CropApp/wwwroot/BreedingDict10000.json
-/CropApp/wwwroot/css/site.min.css
-/CropApp/wwwroot/js/site.min.js
+*.min.js
+*.min.js.map
+*.min.css
+*.min.css.map
diff --git a/CropApp/Backend/CropCalculation.cs b/CropApp/Backend/CropCalculation.cs
@@ -24,20 +24,36 @@ public static class CropCalculation
         private static readonly Dictionary<long, int> RatioZmapping = new Dictionary<long, int>();
 
         private static XorShiftRandom _xstr = new XorShiftRandom();
-
+
+        private static int[] ratios = new int[AllCrops.Count * AllCrops.Count];
+
         public static async Task ProcessBreeding()
         {
-            var fi = new FileInfo("wwwroot/BreedingDict.json");
-            if (fi.Exists)
-            {
-                using var r    = fi.OpenText();
-                var       json = await r.ReadToEndAsync();
-                BreedingDict =
-                    JsonConvert.DeserializeObject<Dictionary<(string, string), List<(string, double)>>>(json);
+            if (await TryLoadCropJsonAsync())
                 return;
-            }
 
-            var ratios  = new int[AllCrops.Count * AllCrops.Count];
+            PrecalculateRatios();
+            Console.WriteLine("precalulated ratios");
+
+            ParallelProcessCrops();
+            Console.WriteLine("done with Parallel processing");
+
+            Console.WriteLine("Sort Directory");
+            SortDictionary();
+            Console.WriteLine("Done sorting Directory");
+            await WriteCropJsonToDisk();
+        }
+
+        private static async Task WriteCropJsonToDisk()
+        {
+            await using var streamWriter = new StreamWriter("wwwroot/BreedingDict.json");
+            await streamWriter.WriteAsync(JsonConvert.SerializeObject(BreedingDict));
+            await streamWriter.FlushAsync();
+            streamWriter.Close();
+        }
+
+        private static void PrecalculateRatios()
+        {
             var counter = 0;
 
             foreach (var cropA in AllCrops)
@@ -50,10 +66,23 @@ public static async Task ProcessBreeding()
                     ++counter;
                 }
             }
-
-            Console.WriteLine("precalulated ratios");
-
-            Parallel.ForEach(AllCrops,
+        }
+
+        private static async Task<bool> TryLoadCropJsonAsync()
+        {
+            var fi = new FileInfo("wwwroot/BreedingDict.json");
+            if (!fi.Exists)
+                return false;
+
+            using var r    = fi.OpenText();
+            var       json = await r.ReadToEndAsync();
+            BreedingDict = JsonConvert.DeserializeObject<Dictionary<(string, string), List<(string, double)>>>(json);
+            return true;
+        }
+
+        private static void ParallelProcessCrops()
+        {
+              Parallel.ForEach(AllCrops,
                              new ParallelOptions {MaxDegreeOfParallelism = 2},
                              cropA =>
                              {
@@ -82,10 +111,11 @@ public static async Task ProcessBreeding()
                                                       //Console.WriteLine("done with this task");
                                                   });
                              });
-
-            Console.WriteLine("done with Parallel processing");
-
-            Console.WriteLine("Sort Directory");
+        }
+
+
+        private static void SortDictionary()
+        {
             foreach (KeyValuePair<long, ConcurrentBag<int>> kvp in Breeding.AsEnumerable()!
                .OrderBy(k => k.Key))
             {
@@ -100,15 +130,8 @@ public static async Task ProcessBreeding()
 
                 BreedingDict.Add(kvp.Key.GetCropNamesFromLong(), q.Select(x => (x.Key, x.Value)).ToList());
             }
-
-            Console.WriteLine("Done sorting Directory");
-
-            await using var streamWriter = new StreamWriter("wwwroot/BreedingDict.json");
-            await streamWriter.WriteAsync(JsonConvert.SerializeObject(BreedingDict));
-            streamWriter.Flush();
-            streamWriter.Close();
         }
-
+        
         private static CropModel AttemptCrossing(Span<int> ratioz, IReadOnlyCollection<int> cropIds)
         {
             if (cropIds.Count > 4 || cropIds.Count < 2)

diff --git a/CropApp/CropApp.csproj b/CropApp/CropApp.csproj
@@ -47,6 +47,18 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       </Content>
+      <Content Update="wwwroot\js\popper.min.js">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </Content>
+      <Content Update="wwwroot\js\popper.min.js.map">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </Content>
+      <Content Update="wwwroot\js\CropPath.js">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </Content>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/CropApp/Pages/CropPath.cshtml b/CropApp/Pages/CropPath.cshtml
@@ -5,19 +5,31 @@
     Layout = "_Layout";
     ViewData["Title"] = "Path";
 }
- <environment include="Development">
-@section Scripts
-{
-    <script src="~/js/CropList.js"></script>
-    <link rel="stylesheet" href="~/css/gridStyles.css"/>
-}
+<environment include="Development">
+    @section Scripts
+    {
+        <script src="~/js/CropList.js"></script>
+        <script src="~/js/CropPath.js"></script>
+        <link rel="stylesheet" href="~/css/gridStyles.css"/>
+    }
+</environment>
+<environment exclude="Development">
+    @section Scripts
+    {
+         <script src="~/js/CropPath.min.js"></script>
+    }
 </environment>
 @{
         var ignoredList = ViewContext.HttpContext.Request.Query["ign"].ToString().Split(',').ToList();
         var crop = ViewContext.HttpContext.Request.Query["crop"];
     }
 <body>
 <h1>@crop</h1>
+<div class="wrapper-single-box">
+    <div class="wrapper-box-left" onclick="toggleMode()" id="toggle">
+        Toggle Mode
+    </div>
+</div>
 <div class="wrapper">
     @foreach (var (parent1, parent2, chance) in Model.Crops)
     {
@@ -31,11 +43,11 @@
             .Replace(" ", "%20");
         <div class="a wrapper-single-box color-crops-wrapper color-crops-wrapper-border">
             <div class="wrapper-double-box">
-                <a onclick="toCropList(event)" class="wrapper-box-left color-crops-wrapper color-crops-wrapper-border" href=@hrefparent1>
+                <a data-toggle="tooltip" data-placement="bottom" title="Ignore this crop" onclick="toCropList(event)" class="wrapper-box-left color-crops-wrapper color-crops-wrapper-border" href=@hrefparent1>
                     Parent 1:
                     @parent1
                 </a>
-                <a onclick="toCropList(event)" class="wrapper-box-right color-crops-wrapper color-crops-wrapper-border" href=@hrefparent2>
+                <a data-toggle="tooltip" data-placement="bottom" title="Ignore this crop" onclick="toCropList(event)" class="wrapper-box-right color-crops-wrapper color-crops-wrapper-border" href=@hrefparent2>
                     Parent 2:
                     @parent2
                 </a>
@@ -58,7 +70,7 @@
                 .Aggregate("/CropPath?crop=" + ViewContext.HttpContext.Request.Query["crop"], (current, ignStr) => current + "&ign=" + ignStr)
                 .Replace(" ", "%20");
             <div class="a wrapper-single-box">
-                <a data-toggle="tooltip" class="wrapper-box-unignore" href=@hrefFilter>
+                <a data-toggle="tooltip" data-placement="bottom" title="Unignore this crop" class="wrapper-box-unignore" href=@hrefFilter>
                     @ignoredCrop
                 </a>
             </div>

diff --git a/CropApp/bundleconfig.json b/CropApp/bundleconfig.json
@@ -5,7 +5,12 @@
       "wwwroot/css/site.css",
       "wwwroot/css/globalStyles.css",
       "wwwroot/css/gridStyles.css"
-    ]
+    ],
+    "minify": {
+      "enabled": true,
+      "colorNames": "hex",
+      "adjustRelativePaths": true
+    }
   },
   {
     "outputFileName": "wwwroot/js/site.min.js",
@@ -15,8 +20,23 @@
     ],
     "minify": {
       "enabled": true,
-      "renameLocals": true
+      "renameLocals": true,
+      "alwaysEscapeNonAscii": true,
+      "termSemicolons": false
+    },
+    "sourceMap": true
+  },
+  {
+    "outputFileName": "wwwroot/js/CropPath.min.js",
+    "inputFiles": [
+      "wwwroot/js/CropPath.js"
+    ],
+    "minify": {
+      "enabled": true,
+      "renameLocals": true,
+      "alwaysEscapeNonAscii": true,
+      "termSemicolons": false
     },
-    "sourceMap": false
+    "sourceMap": true
   }
 ]
diff --git a/CropApp/wwwroot/js/CropList.js b/CropApp/wwwroot/js/CropList.js
@@ -21,18 +21,4 @@ function comparer(index) {
 }
 function getCellValue(row, index) {
     return $(row).children("td").eq(index).text()
-}
-
-function toCropList(e) {
-    if (e.ctrlKey) {
-        e.preventDefault();
-        $(e.target).href=""
-        const text = $(e.target)
-            .text()
-            .replace(/\n {20}Parent \d:/,"")
-            .replace(/\n\s/,"")
-            .replace(/\n\s/,"")
-            .trim();
-        window.location.href = window.location.href.replace(/crop=(?:.*[^&])/,`crop=${text}`);
-    }
 }
diff --git a/CropApp/wwwroot/js/CropPath.js b/CropApp/wwwroot/js/CropPath.js
@@ -0,0 +1,65 @@
+let toggle = false;
+
+function toCropList(e) {
+    if ((e.ctrlKey && toggle)){
+        e.preventDefault();
+        window.location.href = e.target.href;
+        return;
+    }
+    if ((toggle && !e.ctrlKey) || (e.ctrlKey && !toggle)) {
+        e.preventDefault();
+        $(e.target).href=""
+        const text = $(e.target)
+            .text()
+            .replace(/\n {20}Parent \d:/,"")
+            .replace(/\n\s/,"")
+            .replace(/\n\s/,"")
+            .trim();
+        window.location.href = window.location.href.replace(/crop=(?:.*[^&])/,`crop=${text}`);
+    }
+}
+
+function toggleMode() {
+    toggle = !toggle;
+    const element = document.getElementById("toggle");
+    const tooltips = document.getElementsByClassName("wrapper-box-left color-crops-wrapper color-crops-wrapper-border")
+    if (toggle) {
+        element.textContent = "Go to crop mode. Click/Tap here to toggle!"
+        for (const div of tooltips){
+            div.setAttribute("data-original-title","Go to crop")
+        }
+    }
+    else {
+        element.textContent = "Ignore this crop mode. Click/Tap here to toggle!"
+        for (const div of tooltips){
+            div.setAttribute("data-original-title","Ignore this crop")
+        }
+    }
+}
+
+$(document).keydown(
+    function(ev) {
+        if (ev.ctrlKey) {
+            const tooltips = document.body.getElementsByClassName("tooltip-inner");
+            for (const e of tooltips) {
+                if (!toggle)
+                    e.textContent = "Go to crop";
+                else
+                    e.textContent = "Ignore this crop";
+            }
+        }
+    }
+)
+$(document).keyup(
+    function(ev) {
+        if (!ev.ctrlKey) {
+            const tooltips = document.body.getElementsByClassName("tooltip-inner");
+            for (const e of tooltips) {
+                if (!toggle)
+                    e.textContent = "Ignore this crop";
+                else
+                    e.textContent = "Go to crop";
+            }
+        }
+    }
+)
diff --git a/CropApp/wwwroot/js/popper.min.js b/CropApp/wwwroot/js/popper.min.js
diff --git a/CropApp/wwwroot/js/popper.min.js.map b/CropApp/wwwroot/js/popper.min.js.map
diff --git a/CropApp/wwwroot/js/site.js b/CropApp/wwwroot/js/site.js
@@ -1,4 +1 @@
-// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-// for details on configuring this project to bundle and minify static web assets.
-
-// Write your Javascript code.
+