Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MRIBuilder.jl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
MRIBuilder.jl
Compare revisions
6f8cd7120309ab617476eda2b66fb3bb9f59d363 to f1f72c9498ee6ad6874d5a14955263393c2cedcc
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
ndcn0236/mribuilder.jl
Select target project
No results found
f1f72c9498ee6ad6874d5a14955263393c2cedcc
Select Git revision
Branches
10-add-secondary-objective-function
main
pages
Tags
v0.1.0
v0.2.0
v0.3.0
Swap
Target
ndcn0236/mribuilder.jl
Select target project
ndcn0236/mribuilder.jl
1 result
6f8cd7120309ab617476eda2b66fb3bb9f59d363
Select Git revision
Branches
10-add-secondary-objective-function
main
pages
Tags
v0.1.0
v0.2.0
v0.3.0
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Don't worry about inconsistent minimum after 5 successes
· 657aaeaf
Michiel Cottaar
authored
3 months ago
Unverified
657aaeaf
Reduce stringency of tests
· f1f72c94
Michiel Cottaar
authored
3 months ago
Unverified
f1f72c94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/build_sequences.jl
+1
-1
1 addition, 1 deletion
src/build_sequences.jl
test/test_sequences.jl
+2
-2
2 additions, 2 deletions
test/test_sequences.jl
with
3 additions
and
3 deletions
src/build_sequences.jl
View file @
f1f72c94
...
@@ -171,7 +171,7 @@ function optimise_with_cost_func!(jump_model::Model, cost_func, n_attempts, prev
...
@@ -171,7 +171,7 @@ function optimise_with_cost_func!(jump_model::Model, cost_func, n_attempts, prev
#println(solution_summary(jump_model))
#println(solution_summary(jump_model))
if
termination_status
(
jump_model
)
in
(
LOCALLY_SOLVED
,
OPTIMAL
)
if
termination_status
(
jump_model
)
in
(
LOCALLY_SOLVED
,
OPTIMAL
)
nsuccess
+=
1
nsuccess
+=
1
if
isapprox
(
objective_value
(
jump_model
),
min_objective
,
rtol
=
1e-3
)
if
isapprox
(
objective_value
(
jump_model
),
min_objective
,
rtol
=
1e-3
)
||
nsuccess
>
min
(
5
,
n_attempts
)
consistent_minimum
=
true
consistent_minimum
=
true
end
end
if
objective_value
(
jump_model
)
<
min_objective
if
objective_value
(
jump_model
)
<
min_objective
...
...
This diff is collapsed.
Click to expand it.
test/test_sequences.jl
View file @
f1f72c94
...
@@ -102,13 +102,13 @@
...
@@ -102,13 +102,13 @@
@test
variables
.
duration
(
seq
[
1
])
>
1.
@test
variables
.
duration
(
seq
[
1
])
>
1.
for
index
in
1
:
9
for
index
in
1
:
9
if
index
in
[
2
,
6
,
8
]
if
index
in
[
2
,
6
,
8
]
@test
abs
(
variables
.
duration
(
seq
[
index
]))
<
1e-
6
@test
abs
(
variables
.
duration
(
seq
[
index
]))
<
1e-
4
else
else
@test
abs
(
variables
.
duration
(
seq
[
index
]))
>
1
@test
abs
(
variables
.
duration
(
seq
[
index
]))
>
1
end
end
end
end
@test
variables
.
duration
(
seq
[
:
gradient
])
≈
variables
.
duration
(
seq
[
:
gradient2
])
@test
variables
.
duration
(
seq
[
:
gradient
])
≈
variables
.
duration
(
seq
[
:
gradient2
])
@test
variables
.
bval
(
seq
)
≈
2.
rtol
=
1e-
6
@test
variables
.
bval
(
seq
)
≈
2.
rtol
=
1e-
4
@test
length
(
variables
.
readout_times
(
seq
))
>
50
@test
length
(
variables
.
readout_times
(
seq
))
>
50
@test
67
<
variables
.
TE
(
seq
)
<
68
@test
67
<
variables
.
TE
(
seq
)
<
68
@test
72
<
variables
.
duration
(
seq
)
<
73
@test
72
<
variables
.
duration
(
seq
)
<
73
...
...
This diff is collapsed.
Click to expand it.