Merge pull request #797 from IETS3/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
IETS3 · Feb 29, 2024 · a5e229e · a5e229e
2 parents 059b837 + b87bed3
commit a5e229e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...ges/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps b/...ges/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps
@@ -864,19 +864,19 @@
       <property role="1WsWdv" value="weight scaled" />
     </node>
     <node concept="CIrOH" id="69HsIy5Fy7C" role="_iOnB">
-      <property role="TrG5h" value="ngramm" />
+      <property role="TrG5h" value="ng" />
       <ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
     </node>
     <node concept="CIrOH" id="69HsIy5Fye0" role="_iOnB">
-      <property role="TrG5h" value="µgramm" />
+      <property role="TrG5h" value="µg" />
       <ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
     </node>
     <node concept="CIrOH" id="69HsIy5Fy6n" role="_iOnB">
-      <property role="TrG5h" value="mgramm" />
+      <property role="TrG5h" value="mg" />
       <ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
     </node>
     <node concept="CIrOH" id="69HsIy5FxTe" role="_iOnB">
-      <property role="TrG5h" value="gramm" />
+      <property role="TrG5h" value="g" />
       <ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
     </node>
     <node concept="CIrOH" id="69HsIy5FyhU" role="_iOnB">
@@ -885,7 +885,7 @@
     </node>
     <node concept="TRoc0" id="69HsIy5Fyjf" role="_iOnB">
       <ref role="27Q$ZQ" node="5XaocLWHSS6" resolve="kg" />
-      <ref role="27Q$ZR" node="69HsIy5FxTe" resolve="gramm" />
+      <ref role="27Q$ZR" node="69HsIy5FxTe" resolve="g" />
       <node concept="27LzZq" id="69HsIy5Fyjh" role="27P04L">
         <node concept="30dDTi" id="69HsIy5GMkW" role="27K$mF">
           <node concept="2m5Cep" id="69HsIy5FykU" role="30dEsF" />
@@ -896,8 +896,8 @@
       </node>
     </node>
     <node concept="TRoc0" id="69HsIy5GWUQ" role="_iOnB">
-      <ref role="27Q$ZQ" node="69HsIy5FxTe" resolve="gramm" />
       <ref role="27Q$ZR" node="5XaocLWHSS6" resolve="kg" />
+      <ref role="27Q$ZQ" node="69HsIy5FxTe" resolve="g" />
       <node concept="27LzZq" id="69HsIy5GWUR" role="27P04L">
         <node concept="30dvO6" id="69HsIy5GX2G" role="27K$mF">
           <node concept="2m5Cep" id="69HsIy5GWUT" role="30dEsF" />
@@ -908,8 +908,8 @@
       </node>
     </node>
     <node concept="TRoc0" id="69HsIy5Fyn9" role="_iOnB">
-      <ref role="27Q$ZR" node="69HsIy5Fy6n" resolve="mgramm" />
-      <ref role="27Q$ZQ" node="69HsIy5FxTe" resolve="gramm" />
+      <ref role="27Q$ZR" node="69HsIy5Fy6n" resolve="mg" />
+      <ref role="27Q$ZQ" node="69HsIy5FxTe" resolve="g" />
       <node concept="27LzZq" id="69HsIy5Fyna" role="27P04L">
         <node concept="30dDTi" id="69HsIy5GMnB" role="27K$mF">
           <node concept="2m5Cep" id="69HsIy5Fynd" role="30dEsF" />
@@ -920,8 +920,8 @@
       </node>
     </node>
     <node concept="TRoc0" id="69HsIy5GXok" role="_iOnB">
-      <ref role="27Q$ZQ" node="69HsIy5Fy6n" resolve="mgramm" />
-      <ref role="27Q$ZR" node="69HsIy5FxTe" resolve="gramm" />
+      <ref role="27Q$ZQ" node="69HsIy5Fy6n" resolve="mg" />
+      <ref role="27Q$ZR" node="69HsIy5FxTe" resolve="g" />
       <node concept="27LzZq" id="69HsIy5GXol" role="27P04L">
         <node concept="30dvO6" id="69HsIy5GXvO" role="27K$mF">
           <node concept="2m5Cep" id="69HsIy5GXon" role="30dEsF" />

diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
@@ -7293,8 +7293,8 @@
         <node concept="_fku$" id="69HsIy5GLSK" role="_fkur" />
         <node concept="1QScDb" id="69HsIy5GLSL" role="_fkuY">
           <node concept="3EXbTZ" id="69HsIy5GLSM" role="1QScD9">
-            <ref role="3EXiBN" to="ku0a:69HsIy5FxTe" resolve="gramm" />
             <ref role="3EXiBM" to="ku0a:69HsIy5Fyjh" resolve="conversion_kg_gramm (any)" />
+            <ref role="3EXiBN" to="ku0a:69HsIy5FxTe" resolve="g" />
           </node>
           <node concept="1YnStw" id="69HsIy5GU5N" role="30czhm">
             <node concept="CIsGf" id="69HsIy5GU5o" role="2c7tTI">