Skip to content

Commit 7fea494

Browse files
wsafonovwsafonov
committed
fixed sum interpreter for rationals
1 parent 2ba0a1b commit 7fea494

File tree

2 files changed

+129
-54
lines changed
  • code/languages/org.iets3.opensource

2 files changed

+129
-54
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/models/plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3156,7 +3156,7 @@
31563156
<node concept="AQDAd" id="6g4_8tnIcQ9" role="2OqNvi">
31573157
<ref role="37wK5l" node="6g4_8tnG6na" resolve="getBigR" />
31583158
<node concept="3cmrfG" id="6g4_8tnIcQa" role="37wK5m">
3159-
<property role="3cmrfH" value="0" />
3159+
<property role="3cmrfH" value="1" />
31603160
</node>
31613161
</node>
31623162
</node>

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

Lines changed: 128 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,6 @@
261261
</node>
262262
</node>
263263
</node>
264-
<node concept="2zPypq" id="1ghGxCiSlFw" role="_iOnB">
265-
<property role="TrG5h" value="i" />
266-
<property role="0Rz4W" value="-534565321" />
267-
<node concept="30bXRB" id="1ghGxCiSm07" role="2zPyp_">
268-
<property role="30bXRw" value="1" />
269-
</node>
270-
</node>
271264
<node concept="_ixoA" id="1ghGxCiS9lt" role="_iOnB" />
272265
<node concept="_fkuM" id="lj2MdoPgJV" role="_iOnB">
273266
<property role="TrG5h" value="ratRead" />
@@ -338,7 +331,7 @@
338331
</node>
339332
<node concept="_ixoA" id="lj2MdoPg9a" role="_iOnB" />
340333
<node concept="_fkuM" id="1ghGxCiSbqe" role="_iOnB">
341-
<property role="TrG5h" value="ArithWithTwoRat" />
334+
<property role="TrG5h" value="ArithWithRatAndRat" />
342335
<node concept="_fkuZ" id="1ghGxCiSbIr" role="_fkp5">
343336
<node concept="_fku$" id="1ghGxCiSbIs" role="_fkur" />
344337
<node concept="30dDZf" id="1ghGxCiSbIP" role="_fkuY">
@@ -408,13 +401,20 @@
408401
</node>
409402
</node>
410403
<node concept="_ixoA" id="1ghGxCiSmpV" role="_iOnB" />
404+
<node concept="2zPypq" id="1ghGxCiSlFw" role="_iOnB">
405+
<property role="TrG5h" value="int" />
406+
<property role="0Rz4W" value="1426710461" />
407+
<node concept="30bXRB" id="1ghGxCiSm07" role="2zPyp_">
408+
<property role="30bXRw" value="1" />
409+
</node>
410+
</node>
411411
<node concept="_fkuM" id="1ghGxCiSm0$" role="_iOnB">
412412
<property role="TrG5h" value="ArithWithRatAndInt" />
413413
<node concept="_fkuZ" id="1ghGxCiSm0_" role="_fkp5">
414414
<node concept="_fku$" id="1ghGxCiSm0A" role="_fkur" />
415415
<node concept="30dDZf" id="1ghGxCiSm0B" role="_fkuY">
416416
<node concept="_emDc" id="1ghGxCiSnnP" role="30dEs_">
417-
<ref role="_emDf" node="1ghGxCiSlFw" resolve="i" />
417+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
418418
</node>
419419
<node concept="_emDc" id="1ghGxCiSm0D" role="30dEsF">
420420
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
@@ -436,7 +436,7 @@
436436
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
437437
</node>
438438
<node concept="_emDc" id="1ghGxCiSntf" role="30dEs_">
439-
<ref role="_emDf" node="1ghGxCiSlFw" resolve="i" />
439+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
440440
</node>
441441
</node>
442442
<node concept="30cIq6" id="1ghGxCiSobq" role="_fkuS">
@@ -457,7 +457,7 @@
457457
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
458458
</node>
459459
<node concept="_emDc" id="1ghGxCiSs0w" role="30dEs_">
460-
<ref role="_emDf" node="1ghGxCiSlFw" resolve="i" />
460+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
461461
</node>
462462
</node>
463463
<node concept="a1tim" id="1ghGxCiSm0S" role="_fkuS">
@@ -476,7 +476,7 @@
476476
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
477477
</node>
478478
<node concept="_emDc" id="1ghGxCiSsHX" role="30dEs_">
479-
<ref role="_emDf" node="1ghGxCiSlFw" resolve="i" />
479+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
480480
</node>
481481
</node>
482482
<node concept="a1tim" id="1ghGxCiSsNr" role="_fkuS">
@@ -489,6 +489,83 @@
489489
</node>
490490
</node>
491491
</node>
492+
<node concept="_ixoA" id="1ghGxCiUhei" role="_iOnB" />
493+
<node concept="_fkuM" id="1ghGxCiUgOu" role="_iOnB">
494+
<property role="TrG5h" value="ArithWithIntAndRat" />
495+
<node concept="_fkuZ" id="1ghGxCiUgOv" role="_fkp5">
496+
<node concept="_fku$" id="1ghGxCiUgOw" role="_fkur" />
497+
<node concept="30dDZf" id="1ghGxCiUgOx" role="_fkuY">
498+
<node concept="_emDc" id="1ghGxCiUiui" role="30dEs_">
499+
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
500+
</node>
501+
<node concept="_emDc" id="4jFkSe0HHND" role="30dEsF">
502+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
503+
</node>
504+
</node>
505+
<node concept="a1tim" id="4jFkSe0HISw" role="_fkuS">
506+
<node concept="30bXRB" id="4jFkSe0HISx" role="a1tin">
507+
<property role="30bXRw" value="3" />
508+
</node>
509+
<node concept="30bXRB" id="4jFkSe0HISy" role="a1tiq">
510+
<property role="30bXRw" value="2" />
511+
</node>
512+
</node>
513+
</node>
514+
<node concept="_fkuZ" id="1ghGxCiUgOB" role="_fkp5">
515+
<node concept="_fku$" id="1ghGxCiUgOC" role="_fkur" />
516+
<node concept="30dvUo" id="1ghGxCiUgOD" role="_fkuY">
517+
<node concept="_emDc" id="4jFkSe0HI5F" role="30dEsF">
518+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
519+
</node>
520+
<node concept="_emDc" id="1ghGxCiUiF$" role="30dEs_">
521+
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
522+
</node>
523+
</node>
524+
<node concept="a1tim" id="4jFkSe0HIU7" role="_fkuS">
525+
<node concept="30bXRB" id="4jFkSe0HIU8" role="a1tin">
526+
<property role="30bXRw" value="1" />
527+
</node>
528+
<node concept="30bXRB" id="4jFkSe0HIU9" role="a1tiq">
529+
<property role="30bXRw" value="2" />
530+
</node>
531+
</node>
532+
</node>
533+
<node concept="_fkuZ" id="1ghGxCiUgOK" role="_fkp5">
534+
<node concept="_fku$" id="1ghGxCiUgOL" role="_fkur" />
535+
<node concept="30dDTi" id="1ghGxCiUgOM" role="_fkuY">
536+
<node concept="_emDc" id="4jFkSe0HIm8" role="30dEsF">
537+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
538+
</node>
539+
<node concept="_emDc" id="1ghGxCiUjDM" role="30dEs_">
540+
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
541+
</node>
542+
</node>
543+
<node concept="a1tim" id="4jFkSe0HIVx" role="_fkuS">
544+
<node concept="30bXRB" id="4jFkSe0HIVy" role="a1tin">
545+
<property role="30bXRw" value="1" />
546+
</node>
547+
<node concept="30bXRB" id="4jFkSe0HIVz" role="a1tiq">
548+
<property role="30bXRw" value="2" />
549+
</node>
550+
</node>
551+
</node>
552+
<node concept="_fkuZ" id="1ghGxCiUgOS" role="_fkp5">
553+
<node concept="_fku$" id="1ghGxCiUgOT" role="_fkur" />
554+
<node concept="30dvO6" id="1ghGxCiUgOU" role="_fkuY">
555+
<node concept="_emDc" id="4jFkSe0HICa" role="30dEsF">
556+
<ref role="_emDf" node="1ghGxCiSlFw" resolve="int" />
557+
</node>
558+
<node concept="_emDc" id="1ghGxCiUjS4" role="30dEs_">
559+
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
560+
</node>
561+
</node>
562+
<node concept="KUCtu" id="4jFkSe0HIXM" role="_fkuS">
563+
<node concept="30bXRB" id="4jFkSe0HIY9" role="KUCqk">
564+
<property role="30bXRw" value="2" />
565+
</node>
566+
</node>
567+
</node>
568+
</node>
492569
<node concept="_ixoA" id="6Ywz62j3QVu" role="_iOnB" />
493570
<node concept="2zPypq" id="6Ywz62j3YAL" role="_iOnB">
494571
<property role="TrG5h" value="real" />
@@ -547,73 +624,71 @@
547624
<node concept="_emDc" id="6Ywz62j3Qrd" role="30dEsF">
548625
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
549626
</node>
550-
<node concept="30bXRB" id="6Ywz62j44xj" role="30dEs_">
551-
<property role="30bXRw" value="0.2" />
627+
<node concept="_emDc" id="4jFkSe0HudA" role="30dEs_">
628+
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
552629
</node>
553630
</node>
554631
<node concept="30bXRB" id="6Ywz62j49gr" role="_fkuS">
555-
<property role="30bXRw" value="2.5" />
632+
<property role="30bXRw" value="2.0" />
556633
</node>
557634
</node>
558635
</node>
559-
<node concept="_ixoA" id="1ghGxCiUhei" role="_iOnB" />
560-
<node concept="_fkuM" id="1ghGxCiUgOu" role="_iOnB">
561-
<property role="TrG5h" value="ArithWithIntAndRat" />
562-
<node concept="_fkuZ" id="1ghGxCiUgOv" role="_fkp5">
563-
<node concept="_fku$" id="1ghGxCiUgOw" role="_fkur" />
564-
<node concept="30dDZf" id="1ghGxCiUgOx" role="_fkuY">
565-
<node concept="_emDc" id="1ghGxCiUiui" role="30dEs_">
636+
<node concept="_ixoA" id="4jFkSe0H_TE" role="_iOnB" />
637+
<node concept="_fkuM" id="4jFkSe0H_z1" role="_iOnB">
638+
<property role="TrG5h" value="ArithWithRealAndRat" />
639+
<node concept="_fkuZ" id="4jFkSe0HwJ4" role="_fkp5">
640+
<node concept="_fku$" id="4jFkSe0HwJ5" role="_fkur" />
641+
<node concept="30dDZf" id="4jFkSe0HwJ6" role="_fkuY">
642+
<node concept="_emDc" id="4jFkSe0Hx6U" role="30dEs_">
566643
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
567644
</node>
568-
<node concept="_emDc" id="6Ywz62j5qz9" role="30dEsF">
645+
<node concept="_emDc" id="4jFkSe0HwMZ" role="30dEsF">
569646
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
570647
</node>
571648
</node>
572-
<node concept="30bXRB" id="6Ywz62j5sTQ" role="_fkuS">
649+
<node concept="30bXRB" id="4jFkSe0HwJ9" role="_fkuS">
573650
<property role="30bXRw" value="0.75" />
574651
</node>
575652
</node>
576-
<node concept="_fkuZ" id="1ghGxCiUgOB" role="_fkp5">
577-
<node concept="_fku$" id="1ghGxCiUgOC" role="_fkur" />
578-
<node concept="30dvUo" id="1ghGxCiUgOD" role="_fkuY">
579-
<node concept="_emDc" id="6Ywz62j5qOf" role="30dEsF">
580-
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
581-
</node>
582-
<node concept="_emDc" id="1ghGxCiUiF$" role="30dEs_">
653+
<node concept="_fkuZ" id="4jFkSe0HwIY" role="_fkp5">
654+
<node concept="_fku$" id="4jFkSe0HwIZ" role="_fkur" />
655+
<node concept="30dvUo" id="4jFkSe0HwJ0" role="_fkuY">
656+
<node concept="_emDc" id="4jFkSe0HwJ1" role="30dEs_">
583657
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
584658
</node>
585-
</node>
586-
<node concept="30cIq6" id="6Ywz62j5sUD" role="_fkuS">
587-
<node concept="30bXRB" id="6Ywz62j5sUU" role="30czhm">
588-
<property role="30bXRw" value="0.25" />
659+
<node concept="_emDc" id="4jFkSe0HyBZ" role="30dEsF">
660+
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
589661
</node>
590662
</node>
663+
<node concept="30bXRB" id="4jFkSe0HwJ3" role="_fkuS">
664+
<property role="30bXRw" value="-0.25" />
665+
</node>
591666
</node>
592-
<node concept="_fkuZ" id="1ghGxCiUgOK" role="_fkp5">
593-
<node concept="_fku$" id="1ghGxCiUgOL" role="_fkur" />
594-
<node concept="30dDTi" id="1ghGxCiUgOM" role="_fkuY">
595-
<node concept="_emDc" id="6Ywz62j5r5l" role="30dEsF">
596-
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
597-
</node>
598-
<node concept="_emDc" id="1ghGxCiUjDM" role="30dEs_">
667+
<node concept="_fkuZ" id="4jFkSe0HwIS" role="_fkp5">
668+
<node concept="_fku$" id="4jFkSe0HwIT" role="_fkur" />
669+
<node concept="30dDTi" id="4jFkSe0HzLe" role="_fkuY">
670+
<node concept="_emDc" id="4jFkSe0HwIV" role="30dEs_">
599671
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
600672
</node>
673+
<node concept="_emDc" id="4jFkSe0HwIW" role="30dEsF">
674+
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
675+
</node>
601676
</node>
602-
<node concept="30bXRB" id="6Ywz62j5sVP" role="_fkuS">
677+
<node concept="30bXRB" id="4jFkSe0HwIX" role="_fkuS">
603678
<property role="30bXRw" value="0.125" />
604679
</node>
605680
</node>
606-
<node concept="_fkuZ" id="1ghGxCiUgOS" role="_fkp5">
607-
<node concept="_fku$" id="1ghGxCiUgOT" role="_fkur" />
608-
<node concept="30dvO6" id="1ghGxCiUgOU" role="_fkuY">
609-
<node concept="_emDc" id="6Ywz62j5rmr" role="30dEsF">
610-
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
611-
</node>
612-
<node concept="_emDc" id="1ghGxCiUjS4" role="30dEs_">
681+
<node concept="_fkuZ" id="4jFkSe0HwIM" role="_fkp5">
682+
<node concept="_fku$" id="4jFkSe0HwIN" role="_fkur" />
683+
<node concept="30dvO6" id="4jFkSe0H$Wi" role="_fkuY">
684+
<node concept="_emDc" id="4jFkSe0HwIP" role="30dEs_">
613685
<ref role="_emDf" node="1ghGxCiS9JQ" resolve="rat" />
614686
</node>
687+
<node concept="_emDc" id="4jFkSe0HwIQ" role="30dEsF">
688+
<ref role="_emDf" node="6Ywz62j3YAL" resolve="real" />
689+
</node>
615690
</node>
616-
<node concept="30bXRB" id="6Ywz62j5sWk" role="_fkuS">
691+
<node concept="30bXRB" id="4jFkSe0HwIR" role="_fkuS">
617692
<property role="30bXRw" value="0.5" />
618693
</node>
619694
</node>
@@ -708,7 +783,7 @@
708783
</node>
709784
<node concept="_ixoA" id="1ghGxCiWxwn" role="_iOnB" />
710785
<node concept="_fkuM" id="1ghGxCiWyIf" role="_iOnB">
711-
<property role="TrG5h" value="ComparisonRatRAT" />
786+
<property role="TrG5h" value="ComparisonRatAndRat" />
712787
<node concept="_fkuZ" id="1ghGxCiWze8" role="_fkp5">
713788
<node concept="_fku$" id="1ghGxCiWze9" role="_fkur" />
714789
<node concept="30d7iD" id="1ghGxCiWzgz" role="_fkuY">
@@ -760,7 +835,7 @@
760835
</node>
761836
<node concept="_ixoA" id="1ghGxCiXhlk" role="_iOnB" />
762837
<node concept="_fkuM" id="1ghGxCiXgYm" role="_iOnB">
763-
<property role="TrG5h" value="ComparisonRatRATInt" />
838+
<property role="TrG5h" value="ComparisonRatAndInt" />
764839
<node concept="_fkuZ" id="1ghGxCiXjD$" role="_fkp5">
765840
<node concept="_fku$" id="1ghGxCiXjD_" role="_fkur" />
766841
<node concept="30d7iD" id="1ghGxCiXjDA" role="_fkuY">

0 commit comments

Comments
 (0)