Commit d57e6bdd authored by Edward Andò's avatar Edward Andò
Browse files

Finally, after six months... Merge branch 'splitScripts'

parents aaf87e58 17206f39
Pipeline #66247 passed with stages
in 26 minutes and 51 seconds
......@@ -12,13 +12,10 @@ exclude_lines =
def create2Patche*
def create8Patche*
raise InputError
if verbose:
[run]
omit =
*/__init__.py
*/*Toolkit.py
*/_*
*/plotting/*
*optionsParser.py
......
......@@ -43,6 +43,7 @@ pages:
- coverage run -m pytest
- coverage combine && coverage report
- coverage html
#- pytest --cov-report html --cov=spam tools/tests/ ## This is with pytest-cov
- mv coverage public
artifacts:
paths:
......
......@@ -39,6 +39,7 @@ extensions = [
'sphinx.ext.viewcode',
'sphinx.ext.napoleon',
'sphinx_gallery.gen_gallery',
'sphinx.ext.graphviz'
]
sphinx_gallery_conf = {
'backreferences_dir': 'gen_modules/backreferences',
......

digraph G {
rankdir = "TB";
RES [label="compute im1(Φ)-im2", shape=parallelogram, margin=-3, target="_top"];
// scripts
EREG [label="spam-ereg", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#eye-registration-script-spam-ereg"];
DEF [label="spam-deformImage", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#pixel-search-script-spam-pixelsearch", target="_top"];
REG [label="spam-reg", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#registration-script-spam-reg", target="_top"];
PS [label="spam-pixelSearch", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#pixel-search-script-spam-pixelsearch", target="_top"];
FILT [label="spam-filterPhiField", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#filtering-script-spam-filterphifield", target="_top"];
LDIC [label="spam-ldic", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#regular-grid-local-dic-script-spam-ldic", target="_top"];
//PASS [label="spam-passPhiField", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#regular-grid-local-dic-script-spam-ldic", target="_top"];
STR [label="spam-regularStrain", color="#c46747", fillcolor="#FFEAE6", style="bold, filled", shape=ellipse, href="#regular-strain-script-spam-regularstrain", target="_top"];
// questions
QEREG [shape=box, label="misaligned images?"];
QREG [shape=box, label="homogeneous transformation?"];
QPS [shape=box, label="inhomogeneous transformation?"];
QLDIC [shape=box, label="not much happening?"];
QFILT [shape=box, label="filter Φ field?"];
// arrows from questions to scripts
RES -> QEREG;
QEREG -> EREG [label="Yes",color="#3BB300"];
QEREG -> QREG [label="No", color=red];
QREG -> REG [label="Yes",color="#3BB300"];
QREG -> QPS [label="No", color=red];
QPS -> PS [label="Yes",color="#3BB300"];
QPS -> QLDIC[label="No", color=red];
QLDIC -> LDIC [label="Yes",color="#3BB300"];
QFILT -> FILT [label="Yes",color="#3BB300"];
QFILT -> STR [label="No",color=red];
// results
// ereg
EREGR [label="keep Φ", shape=note, margin=-3];
EREG -> EREGR;
//EREGR -> RES;
EREGR -> DEF;
DEF -> RES;
EREGR -> REG[style=dashed, color="#c46747"];
// reg
REGR [label="keep Φ", shape=note, margin=-3];
REG -> REGR[label="Converged?"];
//REGR -> RES;
REGR -> DEF;
//DEF -> RES;
REGR -> PS[style=dashed, color="#c46747"];
REGR -> LDIC[style=dashed, color="#c46747"];
// pixel search
PSR [label="keep Φ field", shape=note, margin=0];
PS -> PSR[label="High CC?"];
//PSR -> RES;
PSR -> DEF//[constraint=false];
//DEF -> RES;
PSR -> QFILT;
PSR -> LDIC[style=dashed, color="#c46747"];
// filter ps
// ldic
LDICR [label="keep Φ field", shape=note, margin=0];
LDIC -> LDICR;
LDICR -> DEF//[constraint=false];
//DEF -> RES;
// filter ldic
LDICR -> QFILT;
FILT -> STR;
}
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="133.60487mm"
height="61.486832mm"
viewBox="0 0 473.40311 217.86671"
id="svg2"
version="1.1"
inkscape:version="0.92.5 (0.92.5+68)"
sodipodi:docname="eregInput.svg"
inkscape:export-filename="/home/3S-LAB/ostamati/Documents/softwares/spam3/spam/docs/source/images/tutorial/scripts/discrete.png"
inkscape:export-xdpi="105.91772"
inkscape:export-ydpi="105.91772">
<defs
id="defs4">
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0"
refX="0"
id="marker3388"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path3386"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6)" />
</marker>
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0"
refX="0"
id="marker9047"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path9045"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker7789"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow2Mend">
<path
transform="scale(-0.6)"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
id="path7787"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker7563"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow2Mstart">
<path
transform="scale(0.6)"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
id="path7561"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0"
refX="0"
id="marker2623"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1921"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Lstart"
orient="auto"
refY="0"
refX="0"
id="Arrow2Lstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1918"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(1.1,0,0,1.1,1.1,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path5680"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0"
refX="0"
id="Arrow2Lend"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path5692"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
inkscape:connector-curvature="0" />
</marker>
<linearGradient
id="linearGradient5632"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop5634" />
</linearGradient>
<linearGradient
id="linearGradient4182"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4184" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="182.85716 : 786.18106 : 1"
inkscape:vp_y="0 : 999.99992 : 0"
inkscape:vp_z="609.80882 : 717.60962 : 1"
inkscape:persp3d-origin="372.04726 : 350.78738 : 1"
id="perspective3336" />
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-6"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-7"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-2"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-9"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-1"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-2"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-9"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-3"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-60"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-6"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-1"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-8"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-7"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-9"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-3"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-7"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-5"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-92"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-7"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-36"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-12"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-93"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-78"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-4"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-50"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-3"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-32"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-0"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-61"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-55"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-6"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-5"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#f00000;fill-opacity:1;fill-rule:evenodd;stroke:#f00000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-69"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-37"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#009000;fill-opacity:1;fill-rule:evenodd;stroke:#009000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-3-4"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-7-7"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#0000b4;fill-opacity:1;fill-rule:evenodd;stroke:#0000b4;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-3-4-4"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-7-7-3"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#0000b4;fill-opacity:1;fill-rule:evenodd;stroke:#0000b4;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-3-4-4-7"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-7-7-3-8"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#0000b4;fill-opacity:1;fill-rule:evenodd;stroke:#0000b4;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3-3-4-4-8"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path5680-5-7-7-3-84"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#0000b4;fill-opacity:1;fill-rule:evenodd;stroke:#0000b4;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>