Skip to content
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

Multisampler #148

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
df6f389
started working on multisampler
mwien Feb 29, 2024
e785e56
minor fixes
mwien Feb 29, 2024
f4cb6c5
add full multisampler
Mar 1, 2024
82ed06c
remove comment
Mar 1, 2024
ef04dea
remove printlns
Mar 1, 2024
c33bd49
Fixes
mschauer Mar 1, 2024
113866d
define penalty
mschauer Mar 1, 2024
030c087
Tuning
mschauer Mar 1, 2024
37ca082
More extensive tests
mschauer Mar 1, 2024
e69b300
rename for clarity
mwien Mar 1, 2024
27fa658
fix copy
mwien Mar 1, 2024
6698330
minor rename
mwien Mar 1, 2024
f8e7b20
remove comment
mwien Mar 1, 2024
00fea92
Fix test
mschauer Mar 1, 2024
953bbb2
Merge pull request #1 from mwien/multisampler2
mwien Mar 1, 2024
0d8f92e
I don't think we can save all graphs
mschauer Mar 2, 2024
5b12aac
fix comment
mwien Mar 2, 2024
0009661
Update src/multisampler.jl
mschauer Mar 2, 2024
35ad2e6
Ups
mschauer Mar 3, 2024
df05f9c
Make sure running init first
mschauer Mar 3, 2024
3f44570
Tricky business involving assuring that log(Pi) < 0
mschauer Mar 3, 2024
750f225
Count kills
mschauer Mar 3, 2024
aea3578
Fixes
mschauer Mar 3, 2024
c2ec4d0
Once more
mschauer Mar 3, 2024
112246d
Update src/multisampler.jl
mschauer Mar 3, 2024
a289505
Update src/multisampler.jl
mschauer Mar 3, 2024
bc4a3f0
Older versions do not support typed globals
mschauer Mar 3, 2024
6256f22
Factoring
mschauer Mar 6, 2024
cc38750
Cosmetics
mschauer Mar 6, 2024
0c5b3fe
Return a bit later
mschauer Mar 6, 2024
6fd67cf
Cosmetics
mschauer Mar 7, 2024
92d8396
Show temp
mschauer Mar 7, 2024
698dbde
Bug fix (never copy dead states)
mschauer Mar 7, 2024
7e3db9e
Need to monitor time.
mschauer Mar 7, 2024
2cec3f4
Score
mschauer Mar 7, 2024
110f294
Move opposite direction
mschauer Mar 7, 2024
67c730b
No need for baseline
mschauer Mar 7, 2024
0e11569
Allow stopping at target
mschauer Mar 10, 2024
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
2 changes: 1 addition & 1 deletion src/multisampler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function multisampler(n, G = (DiGraph(n), 0); M = 10, balance = metropolis_balan
end

# todo: multiply iterations by M to keep passed iteration number indep of M?
# could also stop if one sampler has more than M samples
# could also stop if one sampler has more than iterations many samples
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One can make the argument that the right stopping criterion is the total number of samples of all samplers

# but then @showprogress does not work so nicely?!
iterations *= M
bestgraph = DiGraph(n)
Expand Down
Loading