Browse Source

移除20人限制,更新算法

zhouj1203@hotmail.com 2 years ago
parent
commit
ba9ee77287

+ 1 - 1
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
     <PackageReference Include="Azure.Storage.Blobs.Batch" Version="12.8.0" />
     <PackageReference Include="Azure.Storage.Blobs.Batch" Version="12.8.0" />
     <PackageReference Include="Azure.Storage.Queues" Version="12.9.0" />
     <PackageReference Include="Azure.Storage.Queues" Version="12.9.0" />
-    <PackageReference Include="ClouDASLibx" Version="1.3.1" />
+    <PackageReference Include="ClouDASLibx" Version="1.3.2" />
     <PackageReference Include="DinkToPdf" Version="1.0.8" />
     <PackageReference Include="DinkToPdf" Version="1.0.8" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.15.0" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.15.0" />
     <PackageReference Include="HTEXLib" Version="5.2203.232" />
     <PackageReference Include="HTEXLib" Version="5.2203.232" />

+ 10 - 23
TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -1071,18 +1071,12 @@ namespace TEAMModelOS.Controllers.Analysis
                 resultSum.Add(data.Sum());
                 resultSum.Add(data.Sum());
             }
             }
             //确定高分组 最低分数
             //确定高分组 最低分数
-            double rhw = 0;
-            double rhl = 0;
-            int rhwCount = 0;
-            int rhlCount = 0;
-            if (resultSum.Count >= 20) {
-                resultSum.Sort((s1, s2) => { return s2.CompareTo(s1); });
-                rhwCount = Convert.ToInt32(Math.Floor(resultSum.Count * 0.27));
-                 rhw = rhwCount > 0 ? resultSum[rhwCount] : 0;
-                 rhlCount = Convert.ToInt32(Math.Ceiling(resultSum.Count * 0.73));
-                 rhl = rhlCount > 0 ? resultSum[rhlCount] : 0;
-            }
-           
+            resultSum.Sort((s1, s2) => { return s2.CompareTo(s1); });
+            int rhwCount = Convert.ToInt32(Math.Floor(resultSum.Count * 0.27));
+            double rhw = rhwCount > 0 ? resultSum[rhwCount] : 0;
+            int rhlCount = Convert.ToInt32(Math.Ceiling(resultSum.Count * 0.73));
+            double rhl = rhlCount > 0 ? resultSum[rhlCount - 1] : 0;
+
 
 
 
 
             List<string> knowledgeName = new List<string>();
             List<string> knowledgeName = new List<string>();
@@ -1299,18 +1293,11 @@ namespace TEAMModelOS.Controllers.Analysis
                 resultSum.Add(data.Sum());
                 resultSum.Add(data.Sum());
             }
             }
             //确定高分组 最低分数
             //确定高分组 最低分数
-            double rhw = 0;
-            double rhl = 0;
-            int rhwCount = 0;
-            int rhlCount = 0;
-            if (resultSum.Count >= 20)
-            {
                 resultSum.Sort((s1, s2) => { return s2.CompareTo(s1); });
                 resultSum.Sort((s1, s2) => { return s2.CompareTo(s1); });
-                rhwCount = Convert.ToInt32(Math.Floor(resultSum.Count * 0.27));
-                rhw = rhwCount > 0 ? resultSum[rhwCount] : 0;
-                rhlCount = Convert.ToInt32(Math.Ceiling(resultSum.Count * 0.73));
-                rhl = rhlCount > 0 ? resultSum[rhlCount] : 0;
-            }
+                int rhwCount = Convert.ToInt32(Math.Floor(resultSum.Count * 0.27));
+                double rhw = rhwCount > 0 ? resultSum[rhwCount] : 0;
+                int rhlCount = Convert.ToInt32(Math.Ceiling(resultSum.Count * 0.73));
+                double rhl = rhlCount > 0 ? resultSum[rhlCount-1] : 0;
 
 
             //初始化年级总分
             //初始化年级总分
             double total = 0;
             double total = 0;