modelica · beutlich · Dec 2, 2019 · Dec 2, 2019 · Dec 5, 2019 · Dec 6, 2019
diff --git a/.CI/Test/ModelicaTime.c b/.CI/Test/ModelicaTime.c
@@ -0,0 +1,29 @@
+#include "../../Modelica/Resources/C-Sources/ModelicaTime.h"
+#include "Common.c"
+
+#include <assert.h>
+#include <string.h>
+
+int main(int argc, char **argv) {
+    int ms = 501;
+    int sec = 30;
+    int min = 44;
+    int hour = 20;
+    int mday = 29;
+    int mon = 10;
+    int year = 2020;
+    const char *format = "%Y-%m-%d %H:%M:%S.%L";
+    int maxSize = 128;
+    const char *dateStr = ModelicaTime_strftime(ms, sec, min, hour, mday, mon, year, format, maxSize);
+    ModelicaFormatMessage("Date: %s\n", dateStr);
+    assert(0 == strcmp("2020-10-29 20:44:30.501", dateStr));
+    ModelicaTime_strptime(&ms, &sec, &min, &hour, &mday, &mon, &year, "2000-09-30 06:45:01.123", format);
+    assert(ms == 123);
+    assert(sec == 1);
+    assert(min == 45);
+    assert(hour == 6);
+    assert(mday == 30);
+    assert(mon == 9);
+    assert(year == 2000);
+    return 0;
+}
diff --git a/.CI/Test/test.sh b/.CI/Test/test.sh
@@ -10,6 +10,8 @@ if test ! "$1" = "nostatic"; then
 ./a.out || exit 1
 "$CC" -L $LIBRARIES ModelicaStrings.c -Wl,-Bstatic -lModelicaExternalC -Wl,-Bdynamic || exit 1
 ./a.out || exit 1
+"$CC" -L $LIBRARIES ModelicaTime.c -Wl,-Bstatic -lModelicaExternalC -Wl,-Bdynamic || exit 1
+./a.out || exit 1
 "$CC" -L $LIBRARIES Streams.c -Wl,-Bstatic -lModelicaExternalC -Wl,-Bdynamic || exit 1
 ./a.out || exit 1
 "$CC" -L $LIBRARIES Tables.c -Wl,-Bstatic -lModelicaStandardTables -lModelicaIO -lModelicaMatIO -lzlib -Wl,-Bdynamic -lm || exit 1
@@ -31,6 +33,8 @@ if test ! "$1" = "onlystatic"; then
 ./a.out || exit 1
 "$CC" -L $LIBRARIES -Wl,-rpath $LIBRARIES ModelicaStrings.c -lModelicaExternalC || exit 1
 ./a.out || exit 1
+"$CC" -L $LIBRARIES -Wl,-rpath $LIBRARIES ModelicaTime.c -lModelicaExternalC || exit 1
+./a.out || exit 1
 "$CC" -L $LIBRARIES -Wl,-rpath $LIBRARIES Streams.c -lModelicaExternalC || exit 1
 ./a.out || exit 1
 "$CC" -L $LIBRARIES -Wl,-rpath $LIBRARIES Tables.c -lModelicaStandardTables -lModelicaIO -lModelicaMatIO || exit 1

diff --git a/Complex.mo b/Complex.mo
@@ -18,15 +18,22 @@ operator record Complex "Complex number with overloaded operators"
     end fromReal;
     annotation (Documentation(info="<html>
 <p>Here the constructor operator(s) is/are defined.</p>
-</html>"), Icon(graphics={Rectangle(
+</html>"), Icon(
+        graphics={
+          Rectangle(
             lineColor={200,200,200},
             fillColor={248,248,248},
             fillPattern=FillPattern.HorizontalCylinder,
             extent={{-100,-100},{100,100}},
-            radius=25.0), Rectangle(
+            radius=25.0),
+          Rectangle(
             lineColor={128,128,128},
             extent={{-100,-100},{100,100}},
-            radius=25.0)}));
+            radius=25.0),
+          Text(
+            textColor={128,128,128},
+            extent={{-90,-90},{90,90}},
+            textString="f")}));
   end 'constructor';
 
   encapsulated operator function '0' "Zero-element of addition (= Complex(0))"

diff --git a/Modelica/Blocks/Math.mo b/Modelica/Blocks/Math.mo
@@ -1939,7 +1939,7 @@ Otherwise the input angle <code>u</code> is wrapped to the <a href=\"https://en.
     Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (
        Placement(transformation(extent={{100,-10},{120,10}})));
   equation
-    y = if (u > 0) then integer(floor(u + 0.5)) else integer(ceil(u - 0.5));
+    y = Modelica.Math.nearestInteger(u);
     annotation (Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
@@ -1959,11 +1959,11 @@ Otherwise the input angle <code>u</code> is wrapped to the <a href=\"https://en.
                 30.0,-10.0},{30.0,-20.0},{50.0,0.0}})}), Documentation(info="<html>
 <p>
 This block computes the output <strong>y</strong>
-as <em>nearest integer value</em> of the input <strong>u</strong>:
+as <em>nearest integer value</em> of the input <strong>u</strong> utilizing the
+function <a href=\"modelica://Modelica.Math.nearestInteger\">nearestInteger</a>:
 </p>
 <blockquote><pre>
-y = <strong>integer</strong>( <strong>floor</strong>( u + 0.5 ) )  for  u &gt; 0;
-y = <strong>integer</strong>( <strong>ceil </strong>( u - 0.5 ) )  for  u &lt; 0;
+y = Modelica.Math.<strong>nearestInteger</strong>(u);
 </pre></blockquote>
 </html>"));
   end RealToInteger;

diff --git a/Modelica/Icons.mo b/Modelica/Icons.mo
@@ -527,29 +527,60 @@ This icon is designed for a <strong>translational sensor</strong> model.
             extent={{-150,60},{150,100}},
             textString="%name"),
           Rectangle(
-            origin={0.0,-25.0},
+            origin={0,-25},
             lineColor={64,64,64},
             fillColor={255,215,136},
             fillPattern=FillPattern.Solid,
-            extent={{-100.0,-75.0},{100.0,75.0}},
-            radius=25.0),
+            extent={{-100,-75},{100,75}},
+            radius=25),
           Line(
-            points={{-100.0,0.0},{100.0,0.0}},
+            points={{-100,0},{100,0}},
             color={64,64,64}),
           Line(
-            origin={0.0,-50.0},
-            points={{-100.0,0.0},{100.0,0.0}},
+            origin={0,-50},
+            points={{-100,0},{100,0}},
             color={64,64,64}),
           Line(
-            origin={0.0,-25.0},
-            points={{0.0,75.0},{0.0,-75.0}},
+            origin={0,-25},
+            points={{0,75},{0,-75}},
             color={64,64,64})}), Documentation(info="<html>
 <p>
 This icon is indicates a record.
 </p>
 </html>"));
   end Record;
 
+  partial class OperatorRecord "Icon for operator records"
+
+    annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
+          Text(
+            textColor={0,0,255},
+            extent={{-150,60},{150,100}},
+            textString="%name"),
+          Rectangle(
+            origin={0,-25},
+            lineColor={64,64,64},
+            fillColor={255,215,136},
+            fillPattern=FillPattern.Solid,
+            extent={{-100,-75},{100,75}},
+            radius=25),
+          Line(
+            points={{-100,0},{100,0}},
+            color={64,64,64}),
+          Line(
+            origin={0,-50},
+            points={{-100,0},{100,0}},
+            color={64,64,64}),
+          Line(
+            origin={0,-25},
+            points={{0,75},{0,-75}},
+            color={64,64,64})}), Documentation(info="<html>
+<p>
+This icon is indicates an operator record.
+</p>
+</html>"));
+  end OperatorRecord;
+
   type TypeReal "Icon for Real types"
       extends Real;
       annotation(Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={

diff --git a/Modelica/Math/nearestInteger.mo b/Modelica/Math/nearestInteger.mo
@@ -0,0 +1,44 @@
+within Modelica.Math;
+function nearestInteger "Convert real number to nearest integer value"
+  extends Modelica.Icons.Function;
+
+  input Real r "Real number to convert to integer";
+  output Integer i "Integer value, which is closest to the given real number";
+
+algorithm
+  i :=if (r > 0) then integer(floor(r + 0.5)) else integer(ceil(r - 0.5));
+
+  annotation (Documentation(info="<html>
+
+<h4>Syntax</h4>
+<blockquote><pre>
+Math.<strong>nearestInteger</strong>(r);
+</pre></blockquote>
+
+<h4>Description</h4>
+<p>
+The input value \"r\" of type Real is converted to the closest Integer value \"i\",
+using the <em>round half away from zero</em> rule with the equation:
+</p>
+<blockquote><pre>
+i = <strong>integer</strong>( <strong>floor</strong>( r + 0.5 ) )  for  r &gt; 0;
+i = <strong>integer</strong>(  <strong>ceil</strong>( r - 0.5 ) )  for  r &lt; 0;
+</pre></blockquote>
+
+<h4>Example</h4>
+<blockquote><pre>
+import Modelica.Math;
+Math.nearestInteger(0.4);                     // = 0
+Math.nearestInteger(0.5);                     // = 1
+Math.nearestInteger(-0.4);                    // = 0
+Math.nearestInteger(-0.5);                    // = -1
+</pre></blockquote>
+
+<h4>Note</h4>
+
+<p>
+This function does the same conversion as the block
+<a href=\"modelica://Modelica.Blocks.Math.RealToInteger\">RealToInteger</a>.
+</p>
+</html>"));
+end nearestInteger;
diff --git a/Modelica/Math/package.order b/Modelica/Math/package.order
@@ -10,6 +10,7 @@ FastFourierTransform
 Icons
 isEqual
 isPowerOf2
+nearestInteger
 sin
 cos
 tan

diff --git a/Modelica/Resources/BuildProjects/CMake/src.cmake b/Modelica/Resources/BuildProjects/CMake/src.cmake
@@ -70,9 +70,13 @@ set(EXTC_SOURCES
   "${MODELICA_SOURCE_DIR}/ModelicaRandom.h"
   "${MODELICA_SOURCE_DIR}/ModelicaStrings.c"
   "${MODELICA_SOURCE_DIR}/ModelicaStrings.h"
+  "${MODELICA_SOURCE_DIR}/ModelicaTime.c"
+  "${MODELICA_SOURCE_DIR}/ModelicaTime.h"
   "${MODELICA_SOURCE_DIR}/gconstructor.h"
+  "${MODELICA_SOURCE_DIR}/repl_str.h"
   "${MODELICA_SOURCE_DIR}/stdint_msvc.h"
   "${MODELICA_SOURCE_DIR}/stdint_wrap.h"
+  "${MODELICA_SOURCE_DIR}/strptime.h"
   "${MODELICA_SOURCE_DIR}/uthash.h"
   "${MODELICA_SOURCE_DIR}/win32_dirent.c"
   "${MODELICA_SOURCE_DIR}/win32_dirent.h"

diff --git a/Modelica/Resources/BuildProjects/CMake/test.cmake b/Modelica/Resources/BuildProjects/CMake/test.cmake
@@ -6,6 +6,7 @@ if(MODELICA_BUILD_TESTING)
     set(MODELICA_TESTS
       FileSystem
       ModelicaStrings
+      ModelicaTime
       Streams
       Tables
       TablesFromCsvFile

diff --git a/Modelica/Resources/BuildProjects/autotools/Makefile.am b/Modelica/Resources/BuildProjects/autotools/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libzlib.la libModelicaExternalC.la libModelicaMatIO.la libModelicaIO.la libModelicaStandardTables.la
-libModelicaExternalC_la_SOURCES      = ../../C-Sources/ModelicaFFT.c ../../C-Sources/ModelicaInternal.c ../../C-Sources/ModelicaRandom.c ../../C-Sources/ModelicaStrings.c
+libModelicaExternalC_la_SOURCES      = ../../C-Sources/ModelicaFFT.c ../../C-Sources/ModelicaInternal.c ../../C-Sources/ModelicaRandom.c ../../C-Sources/ModelicaStrings.c ../../C-Sources/ModelicaTime.c
 libModelicaExternalC_la_LIBADD       = @LIBMATH@
 libModelicaIO_la_SOURCES             = ../../C-Sources/ModelicaIO.c
 libModelicaIO_la_LIBADD              = libModelicaMatIO.la

diff --git a/Modelica/Resources/BuildProjects/gcc/Makefile b/Modelica/Resources/BuildProjects/gcc/Makefile
@@ -11,7 +11,8 @@ EXTC_OBJS = \
 	ModelicaFFT.o \
 	ModelicaInternal.o \
 	ModelicaRandom.o \
-	ModelicaStrings.o
+	ModelicaStrings.o \
+	ModelicaTime.o
 
 TABLES_OBJS = \
 	ModelicaStandardTables.o \
@@ -93,6 +94,9 @@ ModelicaRandom.o: ../../C-Sources/ModelicaRandom.c
 ModelicaStrings.o: ../../C-Sources/ModelicaStrings.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
 
+ModelicaTime.o: ../../C-Sources/ModelicaTime.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+
 %.o: ../../C-Sources/zlib/%.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ FastFourierTransform @@
     Icons
     isEqual
     isPowerOf2
+    nearestInteger
     sin
     cos
     tan
@@ Expand Down @@