Repository navigation
Commit dc6885c
committed
Merge pull request #1107 from nden/constraints_issues
Address problems with constraints reported in #1060 and #1064
There's still a minor issue with constraints which is that after fitting the constraint attributes on the parameter objects are reset to the default values. But the model.constraints object has the correct values. I am going to merge this so it can be used and will open a different issue for this last problem I am aware of. It doesn't affect fitting but can be misleading.4 files changed
Lines changed: 38 additions & 52 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
362 | 362 | | |
363 | 363 | | |
364 | 364 | | |
365 | | - | |
| 365 | + | |
366 | 366 | | |
367 | | - | |
| 367 | + | |
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
| 373 | + | |
373 | 374 | | |
374 | 375 | | |
375 | 376 | | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
376 | 381 | | |
377 | 382 | | |
378 | 383 | | |
379 | 384 | | |
380 | 385 | | |
| 386 | + | |
381 | 387 | | |
382 | 388 | | |
383 | 389 | | |
| |||
389 | 395 | | |
390 | 396 | | |
391 | 397 | | |
392 | | - | |
393 | | - | |
394 | | - | |
395 | | - | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
396 | 401 | | |
397 | 402 | | |
398 | 403 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| 119 | + | |
| 120 | + | |
119 | 121 | | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | 122 | | |
125 | 123 | | |
126 | 124 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
150 | | - | |
151 | 150 | | |
152 | 151 | | |
153 | | - | |
154 | 152 | | |
155 | 153 | | |
156 | 154 | | |
157 | | - | |
158 | 155 | | |
159 | 156 | | |
160 | | - | |
161 | 157 | | |
162 | 158 | | |
163 | 159 | | |
164 | | - | |
165 | 160 | | |
166 | 161 | | |
167 | 162 | | |
168 | 163 | | |
169 | | - | |
170 | 164 | | |
171 | 165 | | |
172 | 166 | | |
173 | 167 | | |
174 | | - | |
175 | 168 | | |
176 | 169 | | |
177 | 170 | | |
178 | | - | |
179 | 171 | | |
180 | | - | |
| 172 | + | |
181 | 173 | | |
182 | 174 | | |
183 | 175 | | |
184 | 176 | | |
185 | 177 | | |
186 | | - | |
| 178 | + | |
187 | 179 | | |
188 | 180 | | |
189 | 181 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
43 | | - | |
| 42 | + | |
44 | 43 | | |
45 | 44 | | |
46 | 45 | | |
| |||
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | | - | |
| 70 | + | |
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
75 | | - | |
| 74 | + | |
76 | 75 | | |
77 | 76 | | |
78 | 77 | | |
79 | | - | |
80 | 78 | | |
81 | 79 | | |
82 | 80 | | |
| |||
90 | 88 | | |
91 | 89 | | |
92 | 90 | | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | 91 | | |
98 | 92 | | |
99 | 93 | | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | 94 | | |
104 | 95 | | |
105 | 96 | | |
106 | 97 | | |
107 | 98 | | |
108 | | - | |
109 | | - | |
110 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
111 | 102 | | |
112 | 103 | | |
113 | 104 | | |
114 | 105 | | |
115 | 106 | | |
116 | 107 | | |
117 | | - | |
| 108 | + | |
118 | 109 | | |
119 | 110 | | |
120 | 111 | | |
121 | | - | |
| 112 | + | |
122 | 113 | | |
123 | 114 | | |
124 | 115 | | |
125 | 116 | | |
126 | 117 | | |
127 | 118 | | |
128 | | - | |
| 119 | + | |
129 | 120 | | |
130 | 121 | | |
131 | 122 | | |
132 | | - | |
| 123 | + | |
133 | 124 | | |
134 | 125 | | |
135 | 126 | | |
136 | 127 | | |
137 | 128 | | |
138 | 129 | | |
139 | | - | |
| 130 | + | |
140 | 131 | | |
141 | 132 | | |
142 | 133 | | |
143 | | - | |
| 134 | + | |
144 | 135 | | |
145 | 136 | | |
146 | 137 | | |
147 | 138 | | |
148 | 139 | | |
149 | 140 | | |
150 | 141 | | |
151 | | - | |
| 142 | + | |
152 | 143 | | |
153 | 144 | | |
154 | 145 | | |
155 | 146 | | |
156 | 147 | | |
157 | 148 | | |
158 | | - | |
| 149 | + | |
159 | 150 | | |
160 | 151 | | |
161 | 152 | | |
162 | 153 | | |
163 | 154 | | |
164 | 155 | | |
165 | 156 | | |
166 | | - | |
| 157 | + | |
167 | 158 | | |
168 | 159 | | |
169 | | - | |
| 160 | + | |
170 | 161 | | |
171 | 162 | | |
172 | 163 | | |
173 | | - | |
| 164 | + | |
174 | 165 | | |
175 | 166 | | |
176 | 167 | | |
177 | 168 | | |
178 | 169 | | |
179 | 170 | | |
180 | | - | |
| 171 | + | |
181 | 172 | | |
182 | 173 | | |
183 | 174 | | |
184 | 175 | | |
185 | | - | |
186 | | - | |
| 176 | + | |
| 177 | + | |
187 | 178 | | |
188 | 179 | | |
189 | 180 | | |
190 | 181 | | |
191 | 182 | | |
192 | 183 | | |
193 | | - | |
| 184 | + | |
194 | 185 | | |
195 | 186 | | |
196 | 187 | | |
197 | 188 | | |
198 | | - | |
| 189 | + | |
199 | 190 | | |
200 | 191 | | |
201 | 192 | | |
| |||
0 commit comments