|
1 | 1 | <?xml version="1.0"?>
|
2 |
| -<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.5.0"> |
3 |
| - <Workspace window_x="50" window_y="30" window_width="788" window_height="1050" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" locked="false" lpane_position="100" lpane_open="false" rpane_position="400" rpane_open="false" local_defs="// private definitions for this workspace " name="test_conv" caption="Default empty workspace" filename="$HOME/GIT/nip2/test/workspaces/test_conv.ws"> |
4 |
| - <Column x="0" y="297" open="true" selected="false" sform="false" next="5" name="A" caption="medium test matrix"> |
| 2 | +<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.7.1"> |
| 3 | + <Workspace window_x="0" window_y="28" window_width="1920" window_height="1172" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" locked="false" lpane_position="100" lpane_open="false" rpane_position="400" rpane_open="false" local_defs="// private definitions for this workspace " name="test_conv" caption="Default empty workspace" filename="$HOME/GIT/nip2/test/workspaces/test_conv.ws" major="8" minor="7"> |
| 4 | + <Column x="0" y="279" open="true" selected="false" sform="false" next="5" name="A" caption="medium test matrix"> |
5 | 5 | <Subcolumn vislevel="3">
|
6 | 6 | <Row popup="false" name="A1">
|
7 | 7 | <Rhs vislevel="3" flags="7">
|
|
96 | 96 | </Row>
|
97 | 97 | </Subcolumn>
|
98 | 98 | </Column>
|
99 |
| - <Column x="1051" y="642" open="true" selected="false" sform="false" next="20" name="D" caption="convolve by hand"> |
| 99 | + <Column x="1018" y="586" open="true" selected="false" sform="false" next="20" name="D" caption="convolve by hand"> |
100 | 100 | <Subcolumn vislevel="3">
|
101 | 101 | <Row popup="false" name="D19">
|
102 | 102 | <Rhs vislevel="0" flags="4">
|
|
147 | 147 | </Row>
|
148 | 148 | </Subcolumn>
|
149 | 149 | </Column>
|
150 |
| - <Column x="1603" y="0" open="true" selected="true" sform="false" next="21" name="E" caption="check result"> |
| 150 | + <Column x="1570" y="0" open="true" selected="false" sform="false" next="21" name="E" caption="check result"> |
151 | 151 | <Subcolumn vislevel="3">
|
152 | 152 | <Row popup="false" name="E16">
|
153 | 153 | <Rhs vislevel="0" flags="4">
|
|
230 | 230 | </Row>
|
231 | 231 | </Subcolumn>
|
232 | 232 | </Column>
|
233 |
| - <Column x="0" y="892" open="true" selected="false" sform="false" next="5" name="F" caption="large test matrix"> |
| 233 | + <Column x="0" y="806" open="true" selected="false" sform="false" next="5" name="F" caption="large test matrix"> |
234 | 234 | <Subcolumn vislevel="3">
|
235 | 235 | <Row popup="false" name="F1">
|
236 | 236 | <Rhs vislevel="3" flags="7">
|
|
289 | 289 | </Row>
|
290 | 290 | </Subcolumn>
|
291 | 291 | </Column>
|
292 |
| - <Column x="0" y="124" open="true" selected="false" sform="false" next="7" name="G" caption="small test matrix"> |
| 292 | + <Column x="0" y="122" open="true" selected="false" sform="false" next="7" name="G" caption="small test matrix"> |
293 | 293 | <Subcolumn vislevel="3">
|
294 | 294 | <Row popup="false" name="G6">
|
295 | 295 | <Rhs vislevel="1" flags="4">
|
|
305 | 305 | </Row>
|
306 | 306 | </Subcolumn>
|
307 | 307 | </Column>
|
308 |
| - <Column x="1051" y="0" open="true" selected="false" sform="false" next="8" name="H" caption="convolve by hand"> |
| 308 | + <Column x="1018" y="0" open="true" selected="false" sform="false" next="8" name="H" caption="convolve by hand"> |
309 | 309 | <Subcolumn vislevel="3">
|
310 | 310 | <Row popup="false" name="H1">
|
311 | 311 | <Rhs vislevel="0" flags="4">
|
|
356 | 356 | </Row>
|
357 | 357 | </Subcolumn>
|
358 | 358 | </Column>
|
359 |
| - <Column x="1051" y="1408" open="true" selected="false" sform="false" next="8" name="I" caption="convolve by hand"> |
| 359 | + <Column x="1018" y="1280" open="true" selected="false" sform="false" next="8" name="I" caption="convolve by hand"> |
360 | 360 | <Subcolumn vislevel="3">
|
361 | 361 | <Row popup="false" name="I1">
|
362 | 362 | <Rhs vislevel="0" flags="4">
|
|
407 | 407 | </Row>
|
408 | 408 | </Subcolumn>
|
409 | 409 | </Column>
|
410 |
| - <Column x="1603" y="637" open="true" selected="false" sform="false" next="13" name="N" caption="check result"> |
| 410 | + <Column x="1570" y="541" open="true" selected="false" sform="false" next="13" name="N" caption="check result"> |
411 | 411 | <Subcolumn vislevel="3">
|
412 | 412 | <Row popup="false" name="N1">
|
413 | 413 | <Rhs vislevel="0" flags="4">
|
|
485 | 485 | </Row>
|
486 | 486 | </Subcolumn>
|
487 | 487 | </Column>
|
488 |
| - <Column x="1603" y="1428" open="true" selected="false" sform="false" next="13" name="O" caption="check result"> |
| 488 | + <Column x="1570" y="1260" open="true" selected="true" sform="false" next="14" name="O" caption="check result"> |
489 | 489 | <Subcolumn vislevel="3">
|
490 | 490 | <Row popup="false" name="O1">
|
491 | 491 | <Rhs vislevel="0" flags="4">
|
|
556 | 556 | <iText formula="" ""/>
|
557 | 557 | </Rhs>
|
558 | 558 | </Row>
|
| 559 | + <Row popup="false" name="O13"> |
| 560 | + <Rhs vislevel="1" flags="4"> |
| 561 | + <iText formula=""allow it to differ slightly because of rounding in vector conv""/> |
| 562 | + </Rhs> |
| 563 | + </Row> |
559 | 564 | <Row popup="false" name="O12">
|
560 | 565 | <Rhs vislevel="1" flags="4">
|
561 |
| - <iText formula="if O10 != O2 then error "match failed" else "ok""/> |
| 566 | + <iText formula="if abs (O10 - O2) > 1 then error "match failed" else "ok""/> |
562 | 567 | </Rhs>
|
563 | 568 | </Row>
|
564 | 569 | </Subcolumn>
|
|
0 commit comments