Skip to content

HM refactor #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 95 commits into from
Jun 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
a84c1a6
replace np.ndarray with torch.tensor
radka-j Jun 3, 2025
a2ea999
update HM dashboard to expect tensor
radka-j Jun 3, 2025
2e3eb35
linting
radka-j Jun 3, 2025
fea5fd0
add self.sample method
radka-j Jun 3, 2025
a2c7e6b
add warning
radka-j Jun 3, 2025
cdeb8af
HM dashboard can take both numpy and torch.tensor as input
radka-j Jun 3, 2025
b60e784
update progess bar
radka-j Jun 3, 2025
732368a
mv HM refactor to experimental
radka-j Jun 3, 2025
266ede9
rm use of list, replace with tensor
radka-j Jun 3, 2025
37dcdfe
add initial HM tests to experimental
radka-j Jun 3, 2025
739f60d
save results in HM object
radka-j Jun 3, 2025
73fb22f
rm option to use previous training data stores in emulator object, no…
radka-j Jun 3, 2025
501bf3a
store in_dim and out_dim
radka-j Jun 3, 2025
d81f1cd
update HM emulator
radka-j Jun 3, 2025
3ab12e1
fix type issues
radka-j Jun 3, 2025
a992df2
style fixes
radka-j Jun 3, 2025
1b47eae
refactor nroy calc
radka-j Jun 3, 2025
27f0163
refactor nroy calc
radka-j Jun 3, 2025
597bbff
update dashboard
radka-j Jun 4, 2025
60ddb44
add exploratory nb to test refactor
radka-j Jun 4, 2025
b0411d2
simplify run loop
radka-j Jun 4, 2025
5b9f8cc
update nb
radka-j Jun 4, 2025
eabe4b3
update tests
radka-j Jun 4, 2025
58132b4
add test to nb that refactored HM gives same implausability scores as…
radka-j Jun 4, 2025
1429dbc
add tests
radka-j Jun 4, 2025
1a75d1e
add device handling
radka-j Jun 5, 2025
d6239fc
refactor
radka-j Jun 5, 2025
394753f
add ignore to allow >5 input arguments in HM
radka-j Jun 5, 2025
bcab28b
fix bug in sample_nroy
radka-j Jun 5, 2025
666787a
add SimulatorMetadata
radka-j Jun 10, 2025
0d1e217
add comment
radka-j Jun 10, 2025
6500a1c
Merge branch 'experimental_sim' into hm_refactor
radka-j Jun 11, 2025
5e6a51c
integrate with refactored simulator
radka-j Jun 11, 2025
3173a7e
filter out implausible candidates
radka-j Jun 12, 2025
a952e35
add option to pass observations without noise
radka-j Jun 12, 2025
3247fc4
allow user to initialize HM without simulator
radka-j Jun 13, 2025
e40000a
update tests
radka-j Jun 13, 2025
2058a45
fix bugs and linting
radka-j Jun 13, 2025
d50ad4b
update nb
radka-j Jun 13, 2025
5ba88c3
Merge branch 'main' into hm_refactor
radka-j Jun 13, 2025
076e8ee
rm _predict method
radka-j Jun 14, 2025
f28e571
store tested params and impls values
radka-j Jun 14, 2025
a4f1448
rm filter_nroy_samples method, update get_nroy
radka-j Jun 14, 2025
8b761ff
update nb
radka-j Jun 14, 2025
fbf1438
rm example csv files
radka-j Jun 16, 2025
34774cf
Merge branch 'experimental_sim' into hm_refactor
radka-j Jun 16, 2025
2423ac7
add HistoryMatchingWorkflow class
radka-j Jun 16, 2025
7c5e0a7
clean up tests
radka-j Jun 16, 2025
0469412
initiate HMworkflow with emulator and simulator
radka-j Jun 16, 2025
37180e7
rename variables
radka-j Jun 16, 2025
da71c4b
refactor run to only take n_samples as input, rm progress bar
radka-j Jun 16, 2025
976eeb6
add self.nroy_parameters
radka-j Jun 16, 2025
256a28e
add comment
radka-j Jun 16, 2025
c5488c5
use NROY to update simulator.parameter_bounds and then use simulator.…
radka-j Jun 17, 2025
614b901
only update param bounds if have at least 2 samples
radka-j Jun 17, 2025
0ae0d33
rm print statement
radka-j Jun 17, 2025
d545cd3
Merge branch 'main' into hm_refactor
radka-j Jun 17, 2025
1dc653e
Update autoemulate/experimental/history_matching.py
radka-j Jun 17, 2025
7a558e5
simplify implausability calc
radka-j Jun 17, 2025
5df1164
add test
radka-j Jun 17, 2025
5365aa9
merge conflict
radka-j Jun 17, 2025
c6b32aa
pred_vars is no longer optional input to implausability calc
radka-j Jun 17, 2025
89683f3
update run() loop
radka-j Jun 17, 2025
2b64d01
linting
radka-j Jun 17, 2025
29a3193
fix bug, update nb
radka-j Jun 17, 2025
36f4bf1
push nb update
radka-j Jun 17, 2025
39bb975
add option to add original train x,y data
radka-j Jun 17, 2025
20bb976
add n_test_samples arg
radka-j Jun 17, 2025
3f3076f
add comments
radka-j Jun 17, 2025
797f548
update rank docstring
radka-j Jun 17, 2025
c0a04a8
fix typos
radka-j Jun 17, 2025
1cdfe85
add check for rank < 1
radka-j Jun 17, 2025
3cff93c
refactor rank ValueError
radka-j Jun 17, 2025
7a3cbc5
update what run() returns, update nb
radka-j Jun 18, 2025
f230fff
refactor, add _emulator_predict method
radka-j Jun 18, 2025
4e2821e
update how sample parameters to simulate
radka-j Jun 18, 2025
935538b
Merge branch 'main' into hm_refactor
radka-j Jun 18, 2025
dafed14
linting
radka-j Jun 18, 2025
06f87c7
update test
radka-j Jun 18, 2025
9208d1e
rename variables
radka-j Jun 18, 2025
8de8dd6
update docstrings
radka-j Jun 18, 2025
f720391
refactor run into separate methods
radka-j Jun 19, 2025
9939231
add warning
radka-j Jun 19, 2025
529f7e3
mv emulator predict method to main HistoryMatching class
radka-j Jun 19, 2025
a6834de
Update autoemulate/experimental/history_matching.py
radka-j Jun 20, 2025
f1ded13
Update autoemulate/experimental/history_matching.py
radka-j Jun 20, 2025
a4624d9
better device handling in HM
radka-j Jun 20, 2025
453a19e
more device handling in HM
radka-j Jun 20, 2025
ddc43df
handle possibility of emulator is None
radka-j Jun 20, 2025
5697049
add to run() method
radka-j Jun 20, 2025
587f9c4
add test for max_tries arg added in last commit
radka-j Jun 20, 2025
95a6b27
update docstrings
radka-j Jun 20, 2025
b982e61
Add test for device to history matching
sgreenbury Jun 23, 2025
a373152
Merge pull request #562 from alan-turing-institute/hm_refactor_device
radka-j Jun 24, 2025
b41156f
fix hm nb
radka-j Jun 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading