Skip to content

Commit b51e5ec

Browse files
authored
Merge pull request #1103 from IETS3/bugfix/CompareArbitaryDateRangeValue
datetime.runtime: Fixed compareTo in ArbitraryDateRangeValue
2 parents 1a9c338 + 3a85999 commit b51e5ec

File tree

3 files changed

+81
-3
lines changed

3 files changed

+81
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def major = "2022"
5757
def minor = "2"
5858

5959
// Dependency versions
60-
ext.mpsVersion = '2022.2.3'
60+
ext.mpsVersion = '2022.2.4'
6161

6262
def mbeddrVersion = "2022.2+"
6363
def mpsQAVersion = "$major.$minor+"

code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3304,8 +3304,8 @@
33043304
<node concept="37vLTw" id="6vUyz1z0zvA" role="2Oq$k0">
33053305
<ref role="3cqZAo" node="6vUyz1ySVhx" resolve="value" />
33063306
</node>
3307-
<node concept="liA8E" id="6vUyz1z0zvB" role="2OqNvi">
3308-
<ref role="37wK5l" node="7khFtBHIiHK" resolve="begin" />
3307+
<node concept="liA8E" id="3fu9FvalQ8J" role="2OqNvi">
3308+
<ref role="37wK5l" node="7khFtBHIiHR" resolve="end" />
33093309
</node>
33103310
</node>
33113311
</node>

code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6605,6 +6605,84 @@
66056605
<property role="pfQqC" value="timespan2" />
66066606
</node>
66076607
</node>
6608+
<node concept="_fkuZ" id="3fu9FvasmkH" role="_fkp5">
6609+
<node concept="_fku$" id="3fu9FvasmkF" role="_fkur" />
6610+
<node concept="1QScDb" id="3fu9FvasmkD" role="_fkuY">
6611+
<node concept="3$AVBo" id="3fu9FvasmkB" role="1QScD9" />
6612+
<node concept="3iBYfx" id="3fu9Fvasmk_" role="30czhm">
6613+
<node concept="1QScDb" id="3fu9Fvasmkr" role="3iBYfI">
6614+
<node concept="2oxMaX" id="3fu9Fvasmkp" role="1QScD9">
6615+
<node concept="1fc2QT" id="3fu9Fvasmkn" role="2oxMaW">
6616+
<property role="1fc2QY" value="2023" />
6617+
<property role="1fc2QX" value="01" />
6618+
<property role="1fc2QW" value="01" />
6619+
</node>
6620+
</node>
6621+
<node concept="1fc2QT" id="3fu9Fvasmkl" role="30czhm">
6622+
<property role="1fc2QY" value="2021" />
6623+
<property role="1fc2QX" value="01" />
6624+
<property role="1fc2QW" value="01" />
6625+
</node>
6626+
</node>
6627+
<node concept="1QScDb" id="3fu9Fvasmkz" role="3iBYfI">
6628+
<node concept="2oxMaX" id="3fu9Fvasmkx" role="1QScD9">
6629+
<node concept="1fc2QT" id="3fu9Fvasmkv" role="2oxMaW">
6630+
<property role="1fc2QY" value="2022" />
6631+
<property role="1fc2QX" value="01" />
6632+
<property role="1fc2QW" value="01" />
6633+
</node>
6634+
</node>
6635+
<node concept="1fc2QT" id="3fu9Fvasmkt" role="30czhm">
6636+
<property role="1fc2QY" value="2021" />
6637+
<property role="1fc2QX" value="01" />
6638+
<property role="1fc2QW" value="01" />
6639+
</node>
6640+
</node>
6641+
</node>
6642+
</node>
6643+
<node concept="pfQqD" id="3fu9Fvasmkj" role="pfQ1b">
6644+
<property role="pfQqC" value="timespan3" />
6645+
</node>
6646+
<node concept="3iBYfx" id="3fu9Fvasmkh" role="_fkuS">
6647+
<node concept="1QScDb" id="3fu9Fvasmkf" role="3iBYfI">
6648+
<node concept="2oxMaX" id="3fu9Fvasml1" role="1QScD9">
6649+
<node concept="1fc2QT" id="3fu9FvasmkZ" role="2oxMaW">
6650+
<property role="1fc2QY" value="2022" />
6651+
<property role="1fc2QX" value="01" />
6652+
<property role="1fc2QW" value="01" />
6653+
</node>
6654+
</node>
6655+
<node concept="1fc2QT" id="3fu9FvasmkX" role="30czhm">
6656+
<property role="1fc2QY" value="2021" />
6657+
<property role="1fc2QX" value="01" />
6658+
<property role="1fc2QW" value="01" />
6659+
</node>
6660+
</node>
6661+
<node concept="1QScDb" id="3fu9FvasmkV" role="3iBYfI">
6662+
<node concept="2oxMaX" id="3fu9FvasmkT" role="1QScD9">
6663+
<node concept="1fc2QT" id="3fu9FvarfgA" role="2oxMaW">
6664+
<property role="1fc2QY" value="2023" />
6665+
<property role="1fc2QX" value="01" />
6666+
<property role="1fc2QW" value="01" />
6667+
</node>
6668+
</node>
6669+
<node concept="1fc2QT" id="3fu9FvasmkR" role="30czhm">
6670+
<property role="1fc2QY" value="2021" />
6671+
<property role="1fc2QX" value="01" />
6672+
<property role="1fc2QW" value="01" />
6673+
</node>
6674+
</node>
6675+
</node>
6676+
<node concept="1z9TsT" id="3fu9FvasmkP" role="lGtFl">
6677+
<node concept="OjmMv" id="3fu9FvasmkN" role="1w35rA">
6678+
<node concept="19SGf9" id="3fu9FvasmkL" role="OjmMu">
6679+
<node concept="19SUe$" id="3fu9FvasmkJ" role="19SJt6">
6680+
<property role="19SUeA" value="start date identical --&gt; use end date fpr comparison and sorting " />
6681+
</node>
6682+
</node>
6683+
</node>
6684+
</node>
6685+
</node>
66086686
<node concept="3dYjL0" id="6vUyz1ySMi$" role="_fkp5" />
66096687
<node concept="_fkuZ" id="6vUyz1ySMi_" role="_fkp5">
66106688
<node concept="_fku$" id="6vUyz1ySMiA" role="_fkur" />

0 commit comments

Comments
 (0)