1.湖北理畈修改准确率计算公式，增加实际功率<额定容量的3%筛选

2.南网准确率修改

pom.xml

@@ -10,8 +10,8 @@
     </parent>
     <groupId>com.syjy</groupId>
     <artifactId>calculation-spring-boot-starter</artifactId>
-    <version>0.0.6</version>
-    <!--<version>0.0.6-SNAPSHOT</version>-->
+    <version>0.0.7</version>
+    <!--<version>0.0.7-SNAPSHOT</version>-->
     <name>calculation</name>
     <description>Demo project for Spring Boot</description>
     <properties>
@@ -116,33 +116,26 @@
     </dependencies>
 
     <distributionManagement>
+
         <repository>
             <id>jiayue-releases</id>
-            <url>http://49.4.68.219:8888/nexus/content/repositories/jiayue-releases/</url>
+            <name>Nexus Release Repository</name>
+            <url>http://49.4.68.219:8888/repository/jiayue-releases/</url>
         </repository>
         <snapshotRepository>
             <id>jiayue-snapshots</id>
-            <url>http://49.4.68.219:8888/nexus/content/repositories/jiayue-snapshots/</url>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://49.4.68.219:8888/repository/jiayue-snapshots/</url>
         </snapshotRepository>
 
-        <!--<repository>-->
-            <!--<id>jiayue-releases</id>-->
-            <!--<name>Nexus Release Repository</name>-->
-            <!--<url>http://49.4.68.219:8888/repository/jiayue-releases/</url>-->
-        <!--</repository>-->
-        <!--<snapshotRepository>-->
-            <!--<id>jiayue-snapshots</id>-->
-            <!--<name>Nexus Snapshot Repository</name>-->
-            <!--<url>http://49.4.68.219:8888/repository/jiayue-snapshots/</url>-->
-        <!--</snapshotRepository>-->
-
+        <!--csc-->
         <!--<repository>-->
             <!--<id>jiayue-csc-releases</id>-->
-            <!--<url>http://49.4.68.219:8888/nexus/content/repositories/jiayue-csc-releases/</url>-->
+            <!--<url>http://49.4.68.219:8888/repository/jiayue-csc-releases/</url>-->
         <!--</repository>-->
         <!--<snapshotRepository>-->
             <!--<id>jiayue-csc-snapshots</id>-->
-            <!--<url>http://49.4.68.219:8888/nexus/content/repositories/jiayue-csc-snapshots/</url>-->
+            <!--<url>http://49.4.68.219:8888/repository/jiayue-csc-snapshots/</url>-->
         <!--</snapshotRepository>-->
 
     </distributionManagement>

src/main/java/com/syjy/calculate/function/RootMeanSquaredErrorSouthernPowerGrid.java

@@ -44,11 +44,15 @@ public class RootMeanSquaredErrorSouthernPowerGrid extends AbstractFunction {
             sum = sum.add(forResult);
         }
         // 上下文参数
+
         Map<String, Object> map = new HashMap<>();
+        BigDecimal size = new BigDecimal(seq.hintSize());
+
         map.put("sum", sum);
+        map.put("size",size);
 
         // 求开根号的结果
-        BigDecimal sqrtSum = new BigDecimal(String.valueOf(AviatorEvaluator.execute("math.sqrt(sum/96)", map)));
+        BigDecimal sqrtSum = new BigDecimal(String.valueOf(AviatorEvaluator.execute("math.sqrt(sum/size)", map)));
         map.put("sqrtSum", sqrtSum);
         BigDecimal result = new BigDecimal(String.valueOf(AviatorEvaluator.execute("1-sqrtSum", map)));
         return new AviatorDecimal(result);

src/main/resources/sql/t_calculation_formula.sql

@@ -540,5 +540,12 @@ INSERT INTO `t_calculation_formula` VALUES (541, 'RULES', 1, '    ## 设定返
 INSERT INTO `t_calculation_formula` VALUES (542, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (realValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E53', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (543, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (realValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E53', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (544, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorC(list,ableValue,forecastAbleValue,openCapacity)', 'E21', 'E1;E2', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (544, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorC(list,ableValue,forecastAbleValue,openCapacity)', 'E21', 'E1;E2', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (545, 'DAY_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (546, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (547, 'DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (548, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (549, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (550, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL);
 
 SET FOREIGN_KEY_CHECKS = 1;