Skip to content

Commit

Permalink
#61 Implement units: Added test script
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkulesh
mkulesh committed Feb 12, 2018
1 parent a2eb540 commit cea5cff
Show file tree
Hide file tree
Showing 4 changed files with 604 additions and 90 deletions.
79 changes: 11 additions & 68 deletions app/src/main/assets/ta/ts_template.mmt
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,18 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
<micromath xmlns:mmt="http://micromath.mkulesh.com">
<formulaList textWidth="60" significantDigits="6" scale="0.5" redefineAllowed="true">
<text_fragment>
<term key="text" text="&lt;area&gt;" />
</text_fragment>
<formulaList documentVersion="2" author="Mikhail Kulesh" title="Test case template" description="" textWidth="60" significantDigits="6" scale="0.50000" redefineAllowed="true">
<equation>
<term key="leftTerm" text="begin" />
<term key="rightTerm" text="0" />
</equation>
<equation inRightOfPrevious="true">
<term key="leftTerm" text="error" />
<term key="rightTerm" text="0" />
</equation>
<equation>
<term key="leftTerm" text="a" />
<term key="rightTerm" text="25" />
</equation>
<equation inRightOfPrevious="true">
<term key="leftTerm" text="b" />
<term key="rightTerm" text="-5" />
</equation>
<equation inRightOfPrevious="true">
<term key="leftTerm" text="Nan" />
<term key="rightTerm" code="factorial">
<term key="argTerm" text="-1" />
</term>
</equation>
<equation>
<term key="leftTerm" text="N" />
<term key="rightTerm" text="10" />
</equation>
<equation>
<term key="leftTerm" text="l(x)" />
<term key="rightTerm" code="mult">
<term key="leftTerm" text="2" />
<term key="rightTerm" text="x" />
</term>
</equation>
<equation inRightOfPrevious="true">
<term key="leftTerm" text="r(x)" />
<term key="rightTerm" text="x" />
</equation>
<text_fragment>
<term key="text" text="&#10;TC: &lt;Name&gt;" />
<text_fragment numbering="true">
<term key="text" text="TC: &lt;Name&gt;" />
</text_fragment>
<equation>
<term key="leftTerm" text="begin" />
Expand All @@ -51,9 +21,9 @@
<term key="rightTerm" text="begin" />
</term>
</equation>
<result inRightOfPrevious="true">
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="begin" />
<term key="rightTerm" />
<term key="rightTerm" text="" />
</result>
<equation>
<term key="leftTerm" text="result" />
Expand All @@ -62,52 +32,25 @@
<term key="rightTerm" text="3" />
</term>
</equation>
<result inRightOfPrevious="true">
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="result" />
<term key="rightTerm" />
<term key="rightTerm" text="" />
</result>
<equation>
<term key="leftTerm" text="desired" />
<term key="rightTerm" text="64" />
</equation>
<result inRightOfPrevious="true">
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="desired" />
<term key="rightTerm" />
<term key="rightTerm" text="" />
</result>
<equation>
<term key="leftTerm" text="Δ" />
<term key="rightTerm" code="abs_layout">
<term key="argTerm" code="minus">
<term key="leftTerm" text="desired" />
<term key="rightTerm" text="result" />
</term>
</term>
</equation>
<result inRightOfPrevious="true">
<term key="leftTerm" text="Δ" />
<term key="rightTerm" />
</result>
<equation>
<term key="leftTerm" text="error" />
<term key="rightTerm" code="plus">
<term key="leftTerm" text="Δ" />
<term key="rightTerm" text="error" />
</term>
</equation>
<equation>
<term key="leftTerm" text="end" />
<term key="rightTerm" text="begin" />
</equation>
<result inRightOfPrevious="true">
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="end" />
<term key="rightTerm" />
</result>
<text_fragment>
<term key="text" text="&#10;Overall error" />
</text_fragment>
<result>
<term key="leftTerm" text="error" />
<term key="rightTerm" />
<term key="rightTerm" text="" />
</result>
</formulaList>
</micromath>
33 changes: 11 additions & 22 deletions app/src/main/assets/ta/ts_units.mmt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
<micromath xmlns:mmt="http://micromath.mkulesh.com">
<formulaList documentVersion="2" author="" title="" description="" textWidth="35" significantDigits="6" scale="0.50360" redefineAllowed="true">
<text_fragment>
<term key="text" text="Constants" />
</text_fragment>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<term key="leftTerm" text="10" unit="km" />
<term key="rightTerm" text="" />
</result>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="nF">
<term key="leftTerm" text="55" unit="μF" />
<term key="rightTerm" text="" />
</result>
<formulaList documentVersion="2" author="" title="" description="" textWidth="35" significantDigits="6" scale="0.50000" redefineAllowed="true">
<text_fragment>
<term key="text" text="Operators" />
</text_fragment>
Expand All @@ -37,7 +26,7 @@
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="d1" />
<term key="rightTerm" text="" />
</result>
Expand All @@ -62,7 +51,7 @@
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" text="k" />
<term key="rightTerm" text="" />
</result>
Expand Down Expand Up @@ -132,7 +121,7 @@
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="content:com.mkulesh.micromath.link.F:3">
<term key="argTerm1" text="0.1" unit="km" />
<term key="argTerm2" text="1" unit="hm" />
Expand Down Expand Up @@ -170,7 +159,7 @@
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="content:com.mkulesh.micromath.link.f:2">
<term key="argTerm1" text="68000" />
<term key="argTerm2" text="68E-12" />
Expand All @@ -182,17 +171,17 @@
<term key="rightTerm" code="content:com.mkulesh.micromath.link.f:2">
<term key="argTerm1" code="divide_slash">
<term key="leftTerm" text="r1" />
<term key="rightTerm" text="" unit="Ohm" />
<term key="rightTerm" text="" unit="ohm" />
</term>
<term key="argTerm2" code="divide_slash">
<term key="leftTerm" text="c1" />
<term key="rightTerm" text="" unit="F" />
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="content:com.mkulesh.micromath.link.F:2">
<term key="argTerm1" text="68" unit="kOhm" />
<term key="argTerm1" text="68" unit="kohm" />
<term key="argTerm2" text="68" unit="pF" />
</term>
<term key="rightTerm" text="" />
Expand All @@ -211,7 +200,7 @@
</term>
</term>
</equation>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="content:com.mkulesh.micromath.link.W:2">
<term key="argTerm1" text="1" />
<term key="argTerm2" text="1" />
Expand Down Expand Up @@ -259,13 +248,13 @@
</term>
<term key="rightTerm" text="" />
</result>
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result inRightOfPrevious="true" disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="content:com.mkulesh.micromath.index.M2">
<term key="argTerm" text="n" />
</term>
<term key="rightTerm" text="" />
</result>
<result disableCalculation="false" hideResultField="false" arrayLength="7" units="">
<result disableCalculation="false" hideResultField="false" arrayLength="7">
<term key="leftTerm" code="minus">
<term key="leftTerm" code="content:com.mkulesh.micromath.index.M1">
<term key="argTerm" text="n" />
Expand Down
Loading

0 comments on commit cea5cff

Please sign in to comment.