diff --git a/figs/test_apa_2dof_model.pdf b/figs/test_apa_2dof_model.pdf
index ca352ce..d4e85cf 100644
Binary files a/figs/test_apa_2dof_model.pdf and b/figs/test_apa_2dof_model.pdf differ
diff --git a/figs/test_apa_2dof_model.png b/figs/test_apa_2dof_model.png
index 54d3f56..c878776 100644
Binary files a/figs/test_apa_2dof_model.png and b/figs/test_apa_2dof_model.png differ
diff --git a/figs/test_apa_2dof_model.svg b/figs/test_apa_2dof_model.svg
index 92e455a..016df1b 100644
--- a/figs/test_apa_2dof_model.svg
+++ b/figs/test_apa_2dof_model.svg
@@ -6,7 +6,7 @@
version="1.1"
id="svg3816"
sodipodi:docname="test_apa_2dof_model.svg"
- inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+ inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@@ -23,16 +23,16 @@
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="125.71429"
- inkscape:cy="98.125"
+ inkscape:cy="98.214286"
inkscape:document-units="mm"
- inkscape:current-layer="layer5"
+ inkscape:current-layer="layer6"
inkscape:document-rotation="0"
showgrid="false"
inkscape:snap-midpoints="true"
- inkscape:window-width="2534"
- inkscape:window-height="1367"
- inkscape:window-x="11"
- inkscape:window-y="60"
+ inkscape:window-width="2560"
+ inkscape:window-height="1440"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
@@ -412,6 +412,15 @@
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
id="path6140-7" />
</marker>
+ <g
+ id="g8810">
+ <g
+ id="g1074">
+ <path
+ d="m 3.65625,-3.984375 h 0.859375 c 0.203125,0 0.296875,0 0.296875,-0.203125 0,-0.109375 -0.09375,-0.109375 -0.265625,-0.109375 H 3.71875 L 3.921875,-5.4375 c 0.046875,-0.203125 0.1875,-0.90625 0.25,-1.03125 0.078125,-0.1875 0.25,-0.34375 0.46875,-0.34375 0.03125,0 0.296875,0 0.484375,0.1875 -0.4375,0.03125 -0.546875,0.390625 -0.546875,0.53125 0,0.234375 0.1875,0.359375 0.375,0.359375 C 5.21875,-5.734375 5.5,-5.96875 5.5,-6.34375 c 0,-0.453125 -0.453125,-0.6875 -0.859375,-0.6875 -0.34375,0 -0.96875,0.1875 -1.265625,1.171875 -0.0625,0.203125 -0.09375,0.3125 -0.328125,1.5625 h -0.6875 c -0.203125,0 -0.3125,0 -0.3125,0.1875 0,0.125 0.09375,0.125 0.28125,0.125 h 0.65625 L 2.25,-0.046875 c -0.1875,0.96875 -0.359375,1.875 -0.875,1.875 -0.046875,0 -0.28125,0 -0.484375,-0.1875 C 1.359375,1.609375 1.453125,1.25 1.453125,1.109375 1.453125,0.875 1.265625,0.75 1.078125,0.75 0.8125,0.75 0.53125,0.984375 0.53125,1.359375 c 0,0.4375 0.4375,0.6875 0.84375,0.6875 0.546875,0 0.953125,-0.59375 1.125,-0.96875 0.328125,-0.625 0.546875,-1.828125 0.5625,-1.90625 z m 0,0"
+ id="path8091" />
+ </g>
+ </g>
</defs>
<metadata
id="metadata3813">
@@ -723,7 +732,7 @@
width="38.718697"
height="16.183527"
x="15.21064"
- y="19.260626"
+ y="19.35512"
rx="0.076119758"
ry="0.076119766" />
<text
@@ -951,24 +960,6 @@
</g>
</g>
</g>
- <g
- inkscape:label=""
- transform="translate(36.551226,24.635454)"
- id="g35">
- <g
- fill="#000000"
- fill-opacity="1"
- id="g34"
- transform="matrix(0.352778,0,0,0.352778,-78.4308,-3.97995)">
- <g
- id="use1"
- transform="translate(222.011,16.438)">
- <path
- d="m 3.4375,-4.5 h 1.984375 c 0.140625,0 0.546875,0 0.546875,-0.390625 0,-0.265625 -0.234375,-0.265625 -0.453125,-0.265625 h -3.28125 c -0.28125,0 -0.6875,0 -1.234375,0.59375 -0.3125,0.34375 -0.6875,0.984375 -0.6875,1.046875 0,0.078125 0.0625,0.09375 0.125,0.09375 0.09375,0 0.09375,-0.03125 0.15625,-0.109375 C 1.21875,-4.5 1.84375,-4.5 2.140625,-4.5 H 3.125 l -1.234375,4.09375 c -0.0625,0.171875 -0.0625,0.203125 -0.0625,0.234375 0,0.140625 0.078125,0.296875 0.328125,0.296875 0.359375,0 0.421875,-0.3125 0.46875,-0.5 z m 0,0"
- id="path2" />
- </g>
- </g>
- </g>
<g
inkscape:label=""
transform="translate(55.142421,23.297371)"
@@ -1062,5 +1053,23 @@
</g>
</g>
</g>
+ <g
+ inkscape:label=""
+ transform="translate(36.348066,23.363614)"
+ id="g5">
+ <g
+ fill="#000000"
+ fill-opacity="1"
+ id="g2-1"
+ transform="matrix(0.352778,0,0,0.352778,-65.4658,-2.43972)">
+ <g
+ id="use1-1"
+ transform="translate(185.041,13.947)">
+ <path
+ d="m 3.65625,-3.984375 h 0.859375 c 0.203125,0 0.296875,0 0.296875,-0.203125 0,-0.109375 -0.09375,-0.109375 -0.265625,-0.109375 H 3.71875 L 3.921875,-5.4375 c 0.046875,-0.203125 0.1875,-0.90625 0.25,-1.03125 0.078125,-0.1875 0.25,-0.34375 0.46875,-0.34375 0.03125,0 0.296875,0 0.484375,0.1875 -0.4375,0.03125 -0.546875,0.390625 -0.546875,0.53125 0,0.234375 0.1875,0.359375 0.375,0.359375 C 5.21875,-5.734375 5.5,-5.96875 5.5,-6.34375 c 0,-0.453125 -0.453125,-0.6875 -0.859375,-0.6875 -0.34375,0 -0.96875,0.1875 -1.265625,1.171875 -0.0625,0.203125 -0.09375,0.3125 -0.328125,1.5625 h -0.6875 c -0.203125,0 -0.3125,0 -0.3125,0.1875 0,0.125 0.09375,0.125 0.28125,0.125 h 0.65625 L 2.25,-0.046875 c -0.1875,0.96875 -0.359375,1.875 -0.875,1.875 -0.046875,0 -0.28125,0 -0.484375,-0.1875 C 1.359375,1.609375 1.453125,1.25 1.453125,1.109375 1.453125,0.875 1.265625,0.75 1.078125,0.75 0.8125,0.75 0.53125,0.984375 0.53125,1.359375 c 0,0.4375 0.4375,0.6875 0.84375,0.6875 0.546875,0 0.953125,-0.59375 1.125,-0.96875 0.328125,-0.625 0.546875,-1.828125 0.5625,-1.90625 z m 0,0"
+ id="path2-1" />
+ </g>
+ </g>
+ </g>
</g>
</svg>
diff --git a/figs/test_apa_2dof_model_simscape.pdf b/figs/test_apa_2dof_model_simscape.pdf
index 33e5839..08002c1 100644
Binary files a/figs/test_apa_2dof_model_simscape.pdf and b/figs/test_apa_2dof_model_simscape.pdf differ
diff --git a/figs/test_apa_2dof_model_simscape.png b/figs/test_apa_2dof_model_simscape.png
index ccd2d82..511e303 100644
Binary files a/figs/test_apa_2dof_model_simscape.png and b/figs/test_apa_2dof_model_simscape.png differ
diff --git a/figs/test_apa_2dof_model_simscape.svg b/figs/test_apa_2dof_model_simscape.svg
index 8a589e4..fdd7f00 100644
--- a/figs/test_apa_2dof_model_simscape.svg
+++ b/figs/test_apa_2dof_model_simscape.svg
@@ -6,7 +6,7 @@
version="1.1"
id="svg3816"
sodipodi:docname="test_apa_2dof_model_simscape.svg"
- inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+ inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@@ -21,18 +21,18 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="188.92857"
- inkscape:cy="134.82143"
+ inkscape:zoom="3.959798"
+ inkscape:cx="164.65486"
+ inkscape:cy="132.07745"
inkscape:document-units="mm"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="layer5"
inkscape:document-rotation="0"
showgrid="false"
inkscape:snap-midpoints="true"
- inkscape:window-width="2534"
- inkscape:window-height="1367"
- inkscape:window-x="11"
- inkscape:window-y="60"
+ inkscape:window-width="2560"
+ inkscape:window-height="1440"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
@@ -454,6 +454,15 @@
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
id="path6140-2" />
</marker>
+ <g
+ id="g1793">
+ <g
+ id="g362">
+ <path
+ d="m 3.65625,-3.984375 h 0.859375 c 0.203125,0 0.296875,0 0.296875,-0.203125 0,-0.109375 -0.09375,-0.109375 -0.265625,-0.109375 H 3.71875 L 3.921875,-5.4375 c 0.046875,-0.203125 0.1875,-0.90625 0.25,-1.03125 0.078125,-0.1875 0.25,-0.34375 0.46875,-0.34375 0.03125,0 0.296875,0 0.484375,0.1875 -0.4375,0.03125 -0.546875,0.390625 -0.546875,0.53125 0,0.234375 0.1875,0.359375 0.375,0.359375 C 5.21875,-5.734375 5.5,-5.96875 5.5,-6.34375 c 0,-0.453125 -0.453125,-0.6875 -0.859375,-0.6875 -0.34375,0 -0.96875,0.1875 -1.265625,1.171875 -0.0625,0.203125 -0.09375,0.3125 -0.328125,1.5625 h -0.6875 c -0.203125,0 -0.3125,0 -0.3125,0.1875 0,0.125 0.09375,0.125 0.28125,0.125 h 0.65625 L 2.25,-0.046875 c -0.1875,0.96875 -0.359375,1.875 -0.875,1.875 -0.046875,0 -0.28125,0 -0.484375,-0.1875 C 1.359375,1.609375 1.453125,1.25 1.453125,1.109375 1.453125,0.875 1.265625,0.75 1.078125,0.75 0.8125,0.75 0.53125,0.984375 0.53125,1.359375 c 0,0.4375 0.4375,0.6875 0.84375,0.6875 0.546875,0 0.953125,-0.59375 1.125,-0.96875 0.328125,-0.625 0.546875,-1.828125 0.5625,-1.90625 z m 0,0"
+ id="path8413" />
+ </g>
+ </g>
</defs>
<metadata
id="metadata3813">
@@ -848,7 +857,7 @@
inkscape:groupmode="layer"
id="layer5"
inkscape:label="text"
- transform="translate(15.517906,12.168219)">
+ transform="translate(15.5179, 12.1682)">
<g
inkscape:label=""
transform="translate(-2.1167635,17.133502)"
@@ -1035,24 +1044,6 @@
</g>
</g>
</g>
- <g
- inkscape:label=""
- transform="translate(36.551226,24.635454)"
- id="g35">
- <g
- fill="#000000"
- fill-opacity="1"
- id="g34"
- transform="matrix(0.352778,0,0,0.352778,-78.4308,-3.97995)">
- <g
- id="g85"
- transform="translate(222.011,16.438)">
- <path
- d="m 3.4375,-4.5 h 1.984375 c 0.140625,0 0.546875,0 0.546875,-0.390625 0,-0.265625 -0.234375,-0.265625 -0.453125,-0.265625 h -3.28125 c -0.28125,0 -0.6875,0 -1.234375,0.59375 -0.3125,0.34375 -0.6875,0.984375 -0.6875,1.046875 0,0.078125 0.0625,0.09375 0.125,0.09375 0.09375,0 0.09375,-0.03125 0.15625,-0.109375 C 1.21875,-4.5 1.84375,-4.5 2.140625,-4.5 H 3.125 l -1.234375,4.09375 c -0.0625,0.171875 -0.0625,0.203125 -0.0625,0.234375 0,0.140625 0.078125,0.296875 0.328125,0.296875 0.359375,0 0.421875,-0.3125 0.46875,-0.5 z m 0,0"
- id="path84" />
- </g>
- </g>
- </g>
<g
inkscape:label=""
transform="translate(55.142421,23.297371)"
@@ -1115,5 +1106,23 @@
</g>
</g>
</g>
+ <g
+ inkscape:label=""
+ transform="translate(36.449303,23.245)"
+ id="g5">
+ <g
+ fill="#000000"
+ fill-opacity="1"
+ id="g2-1"
+ transform="matrix(0.352778,0,0,0.352778,-65.4658,-2.43972)">
+ <g
+ id="use1-1"
+ transform="translate(185.041,13.947)">
+ <path
+ d="m 3.65625,-3.984375 h 0.859375 c 0.203125,0 0.296875,0 0.296875,-0.203125 0,-0.109375 -0.09375,-0.109375 -0.265625,-0.109375 H 3.71875 L 3.921875,-5.4375 c 0.046875,-0.203125 0.1875,-0.90625 0.25,-1.03125 0.078125,-0.1875 0.25,-0.34375 0.46875,-0.34375 0.03125,0 0.296875,0 0.484375,0.1875 -0.4375,0.03125 -0.546875,0.390625 -0.546875,0.53125 0,0.234375 0.1875,0.359375 0.375,0.359375 C 5.21875,-5.734375 5.5,-5.96875 5.5,-6.34375 c 0,-0.453125 -0.453125,-0.6875 -0.859375,-0.6875 -0.34375,0 -0.96875,0.1875 -1.265625,1.171875 -0.0625,0.203125 -0.09375,0.3125 -0.328125,1.5625 h -0.6875 c -0.203125,0 -0.3125,0 -0.3125,0.1875 0,0.125 0.09375,0.125 0.28125,0.125 h 0.65625 L 2.25,-0.046875 c -0.1875,0.96875 -0.359375,1.875 -0.875,1.875 -0.046875,0 -0.28125,0 -0.484375,-0.1875 C 1.359375,1.609375 1.453125,1.25 1.453125,1.109375 1.453125,0.875 1.265625,0.75 1.078125,0.75 0.8125,0.75 0.53125,0.984375 0.53125,1.359375 c 0,0.4375 0.4375,0.6875 0.84375,0.6875 0.546875,0 0.953125,-0.59375 1.125,-0.96875 0.328125,-0.625 0.546875,-1.828125 0.5625,-1.90625 z m 0,0"
+ id="path2-1" />
+ </g>
+ </g>
+ </g>
</g>
</svg>
diff --git a/test-bench-apa.pdf b/test-bench-apa.pdf
index e3b40b2..02515c8 100644
Binary files a/test-bench-apa.pdf and b/test-bench-apa.pdf differ