修复 #27 bug

Author: toolgood

csharp/ToolGood.Algorithm2.Test/Tests/IssuesTest.cs

@@ -34,5 +34,14 @@ public void issues_13()
             Assert.AreEqual(dt, 1275);
         }
 
+
+        [Test]
+        public void issues_27()
+        {
+            AlgorithmEngine engine = new AlgorithmEngine();
+            var dt = engine.TryEvaluate("DATE(2024, 8, 1) + TIME(8, 0, 0)", DateTime.Now);
+            Assert.AreEqual(dt, DateTime.Parse("2024-08-01 8:0"));
+        }
+
     }
 }

java/toolgood.algorithm/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.toolgood</groupId>
   <artifactId>toolgood-algorithm</artifactId>
-  <version>3.5.0.2</version>
+  <version>3.5.0.3</version>
   <packaging>jar</packaging>
 
   <name>toolgood.algorithm</name>

java/toolgood.algorithm/src/main/java/toolgood/algorithm/MyDate.java

@@ -72,7 +72,8 @@ public MyDate(BigDecimal num) {
         BigDecimal d = num.subtract(new BigDecimal(days));
         Hour = d.multiply(new BigDecimal(24)).intValue();
         Minute = d.multiply(new BigDecimal(24)).subtract(new BigDecimal(Hour)).multiply(new BigDecimal(60)).intValue();
-        Second = d.multiply(new BigDecimal(24)).subtract(new BigDecimal(Hour)).multiply(new BigDecimal(60)).subtract(new BigDecimal(Minute)).multiply(new BigDecimal(60)).intValue();
+        Second = d.multiply(new BigDecimal(24)).subtract(new BigDecimal(Hour)).multiply(new BigDecimal(60))
+                .subtract(new BigDecimal(Minute)).multiply(new BigDecimal(60)).intValue();
         // 防止秒数出错
         if (Second == 60) {
             Second = 0;
@@ -200,6 +201,7 @@ public String toString() {
                 stringBuffer.append("0");
             }
             stringBuffer.append(Minute);
+            stringBuffer.append(":");
             if (Second < 10) {
                 stringBuffer.append("0");
             }
@@ -218,6 +220,7 @@ public String toString() {
                 stringBuffer.append("0");
             }
             stringBuffer.append(Minute);
+            stringBuffer.append(":");
             if (Second < 10) {
                 stringBuffer.append("0");
             }
@@ -298,11 +301,37 @@ public BigDecimal ToNumber() {
     }
 
     public MyDate ADD(MyDate num) {
-        return new MyDate(this.ToNumber().add(num.ToNumber()));
+        DateTime dt = this.ToDateTime();
+        if (num.Year != null) {
+            dt = dt.plusYears(num.Year);
+        }
+        if (num.Month != null) {
+            dt = dt.plusMonths(num.Month);
+        }
+        if (num.Day != null) {
+            dt = dt.plusDays(num.Day);
+        }
+        dt = dt.plusHours(num.Hour);
+        dt = dt.plusMinutes(num.Minute);
+        dt = dt.plusSeconds(num.Second);
+        return new MyDate(dt);
     }
 
     public MyDate SUB(MyDate num) {
-        return new MyDate(this.ToNumber().subtract(num.ToNumber()));
+        DateTime dt = this.ToDateTime();
+        if (num.Year != null) {
+            dt = dt.plusYears(-num.Year);
+        }
+        if (num.Month != null) {
+            dt = dt.plusMonths(-num.Month);
+        }
+        if (num.Day != null) {
+            dt = dt.plusDays(-num.Day);
+        }
+        dt = dt.plusHours(-num.Hour);
+        dt = dt.plusMinutes(-num.Minute);
+        dt = dt.plusSeconds(-num.Second);
+        return new MyDate(dt);
     }
 
     public MyDate ADD(BigDecimal num) {
@@ -321,5 +350,4 @@ public MyDate DIV(BigDecimal num) {
         return new MyDate(this.ToNumber().divide(num, MathContext.DECIMAL32));
     }
 
-
 }

java/toolgood.algorithm/src/test/java/toolgood/algorithm/DemoApplication.java

@@ -5,6 +5,15 @@
 
 public class DemoApplication {
 	public static void main(String[] args) throws Exception {
+
+        AlgorithmEngine engine = new AlgorithmEngine();
+        MyDate dt2 = engine.TryEvaluate("DATE(2024, 8, 1) + TIME(8, 0, 0)", MyDate.now());
+        System.out.println(dt2);
+
+        MyDate dt3 = engine.TryEvaluate("DATE(2024, 8, 1,1,2,3)", MyDate.now());
+        System.out.println(dt3);
+
+
         AlgorithmEngine e=new AlgorithmEngine();
         int c = e.TryEvaluate("2+3//eee", 0);
         int c2 = e.TryEvaluate("2+3 ee", 0);

java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/IssuesTest.java

@@ -5,6 +5,7 @@
 import org.junit.Test;
 
 import toolgood.algorithm.AlgorithmEngine;
+import toolgood.algorithm.MyDate;
 
 public class IssuesTest {
 
@@ -22,12 +23,19 @@ public void issues_12() {
         assertEquals(num, 40576);
     }
 
-    @Test
     public void issues_13() {
         AlgorithmEngine engine = new AlgorithmEngine();
         int dt = engine.TryEvaluate("days360(date(2020,5,31),date(2023,12,15))", 0);
         assertEquals(dt, 1275);
 
     }
 
+    @Test
+      public void issues_27()
+      {
+          AlgorithmEngine engine = new AlgorithmEngine();
+          MyDate dt = engine.TryEvaluate("DATE(2024, 8, 1) + TIME(8, 0, 0)", MyDate.now());
+          assertEquals(dt.toString(),  "2024-08-01 08:00:00");
+      }
+
 }