Commit c33b4105 authored by Alexandre Bône's avatar Alexandre Bône

Merge branch 'master' of gitlab.icm-institute.org:aramislab/deformetrica

parents 4f0880e9 ba6cbc59
Pipeline #50174246 failed with stages
in 5 minutes and 24 seconds
......@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [4.0.0-rc] - 2018-06-06
### Added
- All existing deformetrica functionnalities now work with 2d or 3d gray level images.
- A L-BFGS optimization method can now be used for registration, regression, deterministic and bayesian atlases.
- A C++/Cuda kernel is now available: [Keops](https://plmlab.math.cnrs.fr/benjamin.charlier/libkeops)
- Gradients are now automagically computed using PyTorch's autograd
......
3.500000 18.500000
18.500000 18.500000
33.500000 18.500000
48.500000 18.500000
63.500000 18.500000
78.500000 18.500000
3.500000 33.500000
18.500000 33.500000
33.500000 33.500000
48.500000 33.500000
63.500000 33.500000
78.500000 33.500000
93.500000 33.500000
108.500000 33.500000
123.500000 33.500000
3.500000 48.500000
18.500000 48.500000
33.500000 48.500000
48.500000 48.500000
63.500000 48.500000
78.500000 48.500000
93.500000 48.500000
108.500000 48.500000
123.500000 48.500000
3.500000 63.500000
18.500000 63.500000
33.500000 63.500000
48.500000 63.500000
63.500000 63.500000
78.500000 63.500000
93.500000 63.500000
108.500000 63.500000
123.500000 63.500000
3.500000 78.500000
18.500000 78.500000
33.500000 78.500000
48.500000 78.500000
63.500000 78.500000
78.500000 78.500000
93.500000 78.500000
108.500000 78.500000
123.500000 78.500000
3.500000 93.500000
18.500000 93.500000
33.500000 93.500000
48.500000 93.500000
63.500000 93.500000
78.500000 93.500000
93.500000 93.500000
108.500000 93.500000
123.500000 93.500000
3.500000 108.500000
18.500000 108.500000
33.500000 108.500000
48.500000 108.500000
63.500000 108.500000
78.500000 108.500000
93.500000 108.500000
108.500000 108.500000
123.500000 108.500000
1 60 2
-0.00190364876828 -0.0286447443222
0.0534897709809 0.179263356795
0.0378422849869 0.435259559927
-0.130253709817 0.265335049203
-0.079913055182 -0.0538689503598
0.0512127834288 -0.270900132813
0.140890551934 0.162974866097
-0.0708071641745 0.0545808206887
-0.0359782398342 -1.6198576157
0.0985819484859 -0.892998377601
-0.168087305334 0.606879788138
-0.297360044511 0.314953520012
-0.0362105883638 -0.0513830540467
-0.0692013790062 0.0735871307264
-0.0643211918719 -0.114337771721
-0.0649153794159 0.0216354111523
-1.76258171564 -2.03334146585
0.168019675479 -5.53066600467
5.35877740015 -5.65527785958
4.7890144089 1.37569995705
0.378815936562 5.38287304302
-0.999576216371 2.41368966556
-0.715610628606 2.36010658605
0.160791862242 -0.302656249543
-0.290424396833 -0.117483290325
-1.72668654945 -0.516365049527
0.0809766108166 -0.513208653545
5.1610167321 -1.49431293558
4.44759521273 0.629851239913
-0.101250410945 1.94258639157
-0.561218408566 0.917138381517
2.56420159696 0.913848787636
3.67388800287 -0.0540308184213
-0.169178427936 0.0869507612794
-2.013929398 1.76596947045
0.0616665691936 4.76564307381
6.03417845743 5.78676439309
5.14948132561 -2.1208914286
0.381549113472 -5.37540202174
-1.01910211798 -2.83555210656
0.466303172037 -2.67315269643
1.65912138978 0.288676853259
0.127134487013 -0.150587729488
-0.604311797581 0.604469196172
0.0411937620152 3.82342665567
1.28074541502 3.0471682004
1.55214210869 -1.04241755276
0.385989343237 -2.54209849192
-0.452521221228 -1.32156950445
-0.537558685988 -1.0702299853
-0.28573372872 0.171563392682
0.0418485247141 -0.00538640227549
0.149960801393 -0.433444555032
0.081373652626 -0.705018145316
-0.414119276403 -0.575358179593
-0.404075300299 -0.150647060689
-0.134229619764 0.465486555677
0.0684532796214 0.325456902555
0.0915567316339 0.155118350779
0.038757198902 0.0212032244828
3.500000 18.500000
18.500000 18.500000
33.500000 18.500000
48.500000 18.500000
63.500000 18.500000
78.500000 18.500000
3.500000 33.500000
18.500000 33.500000
33.500000 33.500000
48.500000 33.500000
63.500000 33.500000
78.500000 33.500000
93.500000 33.500000
108.500000 33.500000
123.500000 33.500000
3.500000 48.500000
18.500000 48.500000
33.500000 48.500000
48.500000 48.500000
63.500000 48.500000
78.500000 48.500000
93.500000 48.500000
108.500000 48.500000
123.500000 48.500000
3.500000 63.500000
18.500000 63.500000
33.500000 63.500000
48.500000 63.500000
63.500000 63.500000
78.500000 63.500000
93.500000 63.500000
108.500000 63.500000
123.500000 63.500000
3.500000 78.500000
18.500000 78.500000
33.500000 78.500000
48.500000 78.500000
63.500000 78.500000
78.500000 78.500000
93.500000 78.500000
108.500000 78.500000
123.500000 78.500000
3.500000 93.500000
18.500000 93.500000
33.500000 93.500000
48.500000 93.500000
63.500000 93.500000
78.500000 93.500000
93.500000 93.500000
108.500000 93.500000
123.500000 93.500000
3.500000 108.500000
18.500000 108.500000
33.500000 108.500000
48.500000 108.500000
63.500000 108.500000
78.500000 108.500000
93.500000 108.500000
108.500000 108.500000
123.500000 108.500000
1 60 2
-0.00693865257512 -0.0101337312172
-0.0110351941925 -0.0499288016585
0.0191342329867 -0.0673463901448
0.0422042535094 -0.050724660673
0.0355827428325 -0.0187493968393
0.0127887511393 -0.0188975230498
-0.0479019618191 -0.0551837665032
0.0803282511004 0.116429554774
0.0131315027732 0.844406406752
-0.360021983997 0.736907532931
-0.0916896194994 0.0730974297709
0.0755208434778 0.18085547145
-0.0193304402317 0.137943824602
-0.0493064371434 0.0727832346032
0.00125776193614 -0.0248300051464
0.116113636096 0.0418110290265
0.896449019336 0.959474076001
-0.191019917948 2.87123903218
-2.95915543302 2.20934415402
-2.12186103416 -0.665824572629
-0.123614541996 0.472213323345
-0.274499749652 0.886510896213
-0.38608488158 0.795747780703
0.0125328772816 0.115850685023
0.529780228024 0.00845906553527
1.82907458234 0.0660829666437
0.301862561071 0.568740329636
-3.36410458215 0.48965079923
-3.65797723696 -0.403414830246
-0.362974886041 0.0225483596332
-0.105565419019 0.169639548663
0.184265792802 0.260671266126
0.577264150475 0.0587667937258
0.33604391479 -0.144674425358
1.46274174498 -1.57947459911
-0.0596750103776 -3.38682729348
-3.89663764354 -2.10948256811
-3.59005380193 1.18968506785
-0.367597657566 -0.361469397794
-0.118956476321 -0.873162191274
-0.0654488141706 -0.781499460353
0.251175466401 -0.13028410636
-0.0186592231378 0.0578563041878
0.321377185851 -0.586010939885
-0.123199292389 -2.15892549789
-1.23525115739 -1.71564096413
-0.678736186882 -0.0138233584384
0.0374776152795 -0.352062366864
-0.0247714937529 -0.325112869827
-0.130078416237 -0.244385222123
-0.0291503954908 0.00776685816772
-0.0191674757828 0.0384842947028
-0.0106764722601 0.118084721965
0.0488728746154 0.0795134332155
0.0675173899685 0.0236022735102
0.0786899941654 0.0138142120604
0.0464723007913 0.0371409644844
0.021433239248 0.106907124949
0.0153542909161 0.0696186759193
0.00678271616916 0.0203877020519
......@@ -2,9 +2,11 @@
<model deformetrica-min-version="3.0.0">
<model-type>Registration</model-type>
<dimension>2</dimension>
<template>
<object id="digit">
<deformable-object-type>SSDImage</deformable-object-type>
<deformable-object-type>Image</deformable-object-type>
<noise-std>0.1</noise-std>
<filename>data/digit_2_sample_10.png</filename>
</object>
......
<?xml version="1.0"?>
<optimization-parameters deformetrica-min-version="3.0.0">
<optimization-method-type>GradientAscent</optimization-method-type>
</optimization-parameters>
......@@ -2,21 +2,22 @@
<model deformetrica-min-version="3.0.0">
<model-type>Registration</model-type>
<dimension>2</dimension>
<template>
<object id="starfish">
<deformable-object-type>NonOrientedPolyline</deformable-object-type>
<deformable-object-type>Polyline</deformable-object-type>
<attachment-type>Current</attachment-type>
<noise-std>0.1</noise-std>
<kernel-width>30.0</kernel-width>
<kernel-width>50.0</kernel-width>
<kernel-type>torch</kernel-type>
<filename>data/starfish_reference.vtk</filename>
</object>
</template>
<deformation-parameters>
<kernel-width>40</kernel-width>
<kernel-width>30</kernel-width>
<kernel-type>torch</kernel-type>
<number-of-timepoints>10</number-of-timepoints>
</deformation-parameters>
</model>
<?xml version="1.0"?>
<optimization-parameters deformetrica-min-version="3.0.0">
<optimization-method-type>GradientAscent</optimization-method-type>
<initial-step-size>1e-3</initial-step-size>
<optimization-method-type>ScipyLBFGS</optimization-method-type>
<max-iterations>200</max-iterations>
</optimization-parameters>
1 25 2
5.70592 -4.48275
4.72495 5.0201
13.7529 11.9041
4.72822 23.8423
17.6298 5.28213
21.0319 -20.4712
7.68677 -5.85086
9.5522 -2.67293
2.38697 -1.93018
13.9926 5.6176
17.9321 28.0729
13.9707 7.16046
-12.5464 -11.0268
1.85098 32.4104
-4.83851 2.35715
34.3301 46.5172
29.9743 1.16853
1.92306 9.1565
5.68936 0.359697
-1.91289 -10.4453
7.80858 -1.37772
-6.21602 -9.51445
-14.1175 35.0099
3.34225 11.4166
-0.379114 -3.39723
# vtk DataFile Version 4.0
vtk output
ASCII
DATASET POLYDATA
POINTS 194 float
151 30.9503 0 155 32.536 0 157.34 36 0
158.272 41 0 157.986 46 0 157 51.6223 0
156 56.1489 0 154.854 61 0 153.637 66 0
152.402 71 0 151.164 76 0 150 80.745 0
148.976 85 0 147.804 90 0 146.697 95 0
145.775 100 0 145.473 106 0 146.972 111 0
150 113.957 0 154 115.282 0 160 115.474 0
166 115.081 0 171 114.714 0 177 114.28 0
182 113.84 0 188 113.165 0 193 112.549 0
198 111.965 0 204 111.341 0 209 110.931 0
215 110.789 0 220 111.39 0 224.17 113 0
227.262 116 0 228 120.859 0 226 124.414 0
222.448 127 0 218 128.655 0 213 129.682 0
208 130.342 0 202 130.951 0 197 131.384 0
191 131.827 0 186 132.199 0 180 132.768 0
175 133.358 0 169.765 134 0 164 134.683 0
159 135.339 0 154 136.432 0 150 138.305 0
147 141.219 0 145 145.838 0 144.755 151 0
145.545 156 0 146.716 161 0 147.996 166 0
149.042 170 0 150.346 175 0 151.63 180 0
152.895 185 0 154 189.398 0 155.155 194 0
156.407 199 0 157.63 204 0 158.709 209 0
159.369 214 0 159 219.444 0 157 223.656 0
153 225.967 0 149 225.306 0 145.937 223 0
143.18 219 0 141.43 215 0 140 210.673 0
138.682 206 0 137.374 201 0 136.105 196 0
135 191.602 0 133.844 187 0 132.579 182 0
131.288 177 0 130 172.255 0 128.702 168 0
127 163.692 0 124.465 160 0 120 158.085 0
115 159.842 0 112 162.31 0 109 165.515 0
106.146 169 0 103.839 172 0 101 175.78 0
98.5401 179 0 96 182.164 0 93 185.666 0
90 188.966 0 87.1476 192 0 84.2836 195 0
81.3387 198 0 78.0886 201 0 75 203.236 0
70 204.954 0 65.2334 203 0 63.9135 199 0
65 194.032 0 67 190.147 0 69.0397 187 0
71.8842 183 0 74.0867 180 0 77 176.1 0
79.3765 173 0 82 169.675 0 84.9475 166 0
87.2622 163 0 89.839 159 0 91.0249 155 0
89 151.771 0 84 150.905 0 79 151.409 0
74 152.37 0 69 153.538 0 64 154.799 0
59.3236 156 0 55 157.085 0 50 158.228 0
45 159.056 0 39 159.086 0 35 157.886 0
31.8162 155 0 31.0041 151 0 33 146.757 0
36.22 144 0 40.1221 142 0 45 140.284 0
49.5378 139 0 54 137.826 0 59 136.527 0
64 135.22 0 68.6715 134 0 73 132.881 0
78 131.606 0 83 130.339 0 88 129.059 0
92 127.993 0 97 126.495 0 101 124.956 0
105 122.573 0 108 119.276 0 109.618 115 0
109.521 109 0 108.3 104 0 106.962 100 0
105.077 95 0 103.533 91 0 102 86.9035 0
100.216 82 0 98.7534 78 0 97 73.3652 0
95.2787 69 0 93.6526 65 0 92 60.9961 0
90 56.0413 0 88.5573 52 0 87.3343 47 0
87.3956 41 0 89.3334 37 0 93 34.8839 0
98 35.7969 0 101 38.0881 0 103.977 42 0
106 45.8665 0 107.735 50 0 109.245 54 0
111 58.7205 0 112.662 63 0 114.32 67 0
116.133 71 0 118.224 75 0 120.965 79 0
124 81.3105 0 128.145 80 0 130.62 76 0
132.167 72 0 133.682 67 0 135 62.0563 0
136.014 58 0 137.235 53 0 138.496 48 0
139.957 43 0 141.507 39 0 143.862 35 0
147 32.0926 0 151 30.9503 0
LINES 194 582
2 0 1
2 1 2
2 2 3
2 3 4
2 4 5
2 5 6
2 6 7
2 7 8
2 8 9
2 9 10
2 10 11
2 11 12
2 12 13
2 13 14
2 14 15
2 15 16
2 16 17
2 17 18
2 18 19
2 19 20
2 20 21
2 21 22
2 22 23
2 23 24
2 24 25
2 25 26
2 26 27
2 27 28
2 28 29
2 29 30
2 30 31
2 31 32
2 32 33
2 33 34
2 34 35
2 35 36
2 36 37
2 37 38
2 38 39
2 39 40
2 40 41
2 41 42
2 42 43
2 43 44
2 44 45
2 45 46
2 46 47
2 47 48
2 48 49
2 49 50
2 50 51
2 51 52
2 52 53
2 53 54
2 54 55
2 55 56
2 56 57
2 57 58
2 58 59
2 59 60
2 60 61
2 61 62
2 62 63
2 63 64
2 64 65
2 65 66
2 66 67
2 67 68
2 68 69
2 69 70
2 70 71
2 71 72
2 72 73
2 73 74
2 74 75
2 75 76
2 76 77
2 77 78
2 78 79
2 79 80
2 80 81
2 81 82
2 82 83
2 83 84
2 84 85
2 85 86
2 86 87
2 87 88
2 88 89
2 89 90
2 90 91
2 91 92
2 92 93
2 93 94
2 94 95
2 95 96
2 96 97
2 97 98
2 98 99
2 99 100
2 100 101
2 101 102
2 102 103
2 103 104
2 104 105
2 105 106
2 106 107
2 107 108
2 108 109
2 109 110
2 110 111
2 111 112
2 112 113
2 113 114
2 114 115
2 115 116
2 116 117
2 117 118
2 118 119
2 119 120
2 120 121
2 121 122
2 122 123
2 123 124
2 124 125
2 125 126
2 126 127
2 127 128
2 128 129
2 129 130
2 130 131
2 131 132
2 132 133
2 133 134
2 134 135
2 135 136
2 136 137
2 137 138
2 138 139
2 139 140
2 140 141
2 141 142
2 142 143
2 143 144
2 144 145
2 145 146
2 146 147
2 147 148
2 148 149
2 149 150
2 150 151
2 151 152
2 152 153
2 153 154
2 154 155
2 155 156
2 156 157
2 157 158
2 158 159
2 159 160
2 160 161
2 161 162
2 162 163
2 163 164
2 164 165
2 165 166
2 166 167
2 167 168
2 168 169
2 169 170
2 170 171
2 171 172
2 172 173
2 173 174
2 174 175
2 175 176
2 176 177
2 177 178
2 178 179
2 179 180
2 180 181
2 181 182
2 182 183
2 183 184
2 184 185
2 185 186
2 186 187
2 187 188
2 188 189
2 189 190
2 190 191
2 191 192
2 192 193
2 193 0
# vtk DataFile Version 4.0
vtk output
ASCII
DATASET POLYDATA
POINTS 194 float
151 30.9503 0 155 32.536 0 157.34 36 0
158.272 41 0 157.986 46 0 157 51.6223 0
156 56.1489 0 154.854 61 0 153.637 66 0
152.402 71 0 151.164 76 0 150 80.745 0
148.976 85 0 147.804 90 0 146.697 95 0
145.775 100 0 145.473 106 0 146.972 111 0
150 113.957 0 154 115.282 0 160 115.474 0
166 115.081 0 171 114.714 0 177 114.28 0
182 113.84 0 188 113.165 0 193 112.549 0
198 111.965 0 204 111.341 0 209 110.931 0
215 110.789 0 220 111.39 0 224.17 113 0
227.262 116 0 228 120.859 0 226 124.414 0
222.448 127 0 218 128.655 0 213 129.682 0
208 130.342 0 202 130.951 0 197 131.384 0
191 131.827 0 186 132.199 0 180 132.768 0
175 133.358 0 169.765 134 0 164 134.683 0
159 135.339 0 154 136.432 0 150 138.305 0
147 141.219 0 145 145.838 0 144.755 151 0
145.545 156 0 146.716 161 0 147.996 166 0
149.042 170 0 150.346 175 0 151.63 180 0
152.895 185 0 154 189.398 0 155.155 194 0
156.407 199 0 157.63 204 0 158.709 209 0
159.369 214 0 159 219.444 0 157 223.656 0
153 225.967 0 149 225.306 0 145.937 223 0
143.18 219 0 141.43 215 0 140 210.673 0
138.682 206 0 137.374 201 0 136.105 196 0
135 191.602 0 133.844 187 0 132.579 182 0
131.288 177 0 130 172.255 0 128.702 168 0
127 163.692 0 124.465 160 0 120 158.085 0
115 159.842 0 112 162.31 0 109 165.515 0
106.146 169 0 103.839 172 0 101 175.78 0
98.5401 179 0 96 182.164 0 93 185.666 0
90 188.966 0 87.1476 192 0 84.2836 195 0
81.3387 198 0 78.0886 201 0 75 203.236 0
70 204.954 0 65.2334 203 0 63.9135 199 0
65 194.032 0 67 190.147 0 69.0397 187 0
71.8842 183 0 74.0867 180 0 77 176.1 0
79.3765 173 0 82 169.675 0 84.9475 166 0
87.2622 163 0 89.839 159 0 91.0249 155 0
89 151.771 0 84 150.905 0 79 151.409 0
74 152.37 0 69 153.538 0 64 154.799 0
59.3236 156 0 55 157.085 0 50 158.228 0
45 159.056 0 39 159.086 0 35 157.886 0
31.8162 155 0 31.0041 151 0 33 146.757 0
36.22 144 0 40.1221 142 0 45 140.284 0
49.5378 139 0 54 137.826 0 59 136.527 0
64 135.22 0 68.6715 134 0 73 132.881 0
78 131.606 0 83 130.339 0 88 129.059 0
92 127.993 0 97 126.495 0 101 124.956 0
105 122.573 0 108 119.276 0 109.618 115 0
109.521 109 0 108.3 104 0 106.962 100 0
105.077 95 0 103.533 91 0 102 86.9035 0
100.216 82 0 98.7534 78 0 97 73.3652 0
95.2787 69 0 93.6526 65 0 92 60.9961 0
90 56.0413 0 88.5573 52 0 87.3343 47 0
87.3956 41 0 89.3334 37 0 93 34.8839 0
98 35.7969 0 101 38.0881 0 103.977 42 0
106 45.8665 0 107.735 50 0 109.245 54 0
111 58.7205 0 112.662 63 0 114.32 67 0
116.133 71 0 118.224 75 0 120.965 79 0
124 81.3105 0 128.145 80 0 130.62 76 0
132.167 72 0 133.682 67 0 135 62.0563 0
136.014 58 0 137.235 53 0 138.496 48 0
139.957 43 0 141.507 39 0 143.862 35 0
147 32.0926 0 151 30.9503 0
LINES 194 582
2 0 1
2 1 2
2 2 3
2 3 4
2 4 5
2 5 6
2 6 7
2 7 8
2 8 9
2 9 10
2 10 11
2 11 12
2 12 13