Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Gregory Ashton
PyFstat
Commits
2bf77d55
Commit
2bf77d55
authored
Dec 01, 2016
by
Gregory Ashton
Browse files
Updates directed MCMC results
parent
0e89feb6
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Paper/DirectedMC/MCResults.txt
View file @
2bf77d55
This diff is collapsed.
Click to expand it.
Paper/DirectedMC/generate_data.py
View file @
2bf77d55
...
@@ -31,8 +31,7 @@ VF0 = VF1 = 100
...
@@ -31,8 +31,7 @@ VF0 = VF1 = 100
DeltaF0
=
VF0
*
np
.
sqrt
(
3
)
/
(
np
.
pi
*
Tspan
)
DeltaF0
=
VF0
*
np
.
sqrt
(
3
)
/
(
np
.
pi
*
Tspan
)
DeltaF1
=
VF1
*
np
.
sqrt
(
45
/
4.
)
/
(
np
.
pi
*
Tspan
**
2
)
DeltaF1
=
VF1
*
np
.
sqrt
(
45
/
4.
)
/
(
np
.
pi
*
Tspan
**
2
)
depths
=
np
.
linspace
(
100
,
400
,
7
)
depths
=
np
.
linspace
(
100
,
400
,
9
)
depths
=
[
125
,
175
]
nsteps
=
20
nsteps
=
20
run_setup
=
[((
nsteps
,
0
),
20
,
False
),
run_setup
=
[((
nsteps
,
0
),
20
,
False
),
...
@@ -41,10 +40,7 @@ run_setup = [((nsteps, 0), 20, False),
...
@@ -41,10 +40,7 @@ run_setup = [((nsteps, 0), 20, False),
((
nsteps
,
nsteps
),
1
,
False
)]
((
nsteps
,
nsteps
),
1
,
False
)]
for
depth
in
depths
:
for
depth
in
depths
:
startTime
=
time
.
time
()
h0
=
sqrtSX
/
float
(
depth
)
h0
=
sqrtSX
/
float
(
depth
)
r
=
np
.
random
.
uniform
(
0
,
1
)
theta
=
np
.
random
.
uniform
(
0
,
2
*
np
.
pi
)
F0
=
F0_center
+
np
.
random
.
uniform
(
-
0.5
,
0.5
)
*
DeltaF0
F0
=
F0_center
+
np
.
random
.
uniform
(
-
0.5
,
0.5
)
*
DeltaF0
F1
=
F1_center
+
np
.
random
.
uniform
(
-
0.5
,
0.5
)
*
DeltaF1
F1
=
F1_center
+
np
.
random
.
uniform
(
-
0.5
,
0.5
)
*
DeltaF1
...
@@ -60,6 +56,7 @@ for depth in depths:
...
@@ -60,6 +56,7 @@ for depth in depths:
data
.
make_data
()
data
.
make_data
()
predicted_twoF
=
data
.
predict_fstat
()
predicted_twoF
=
data
.
predict_fstat
()
startTime
=
time
.
time
()
theta_prior
=
{
'F0'
:
{
'type'
:
'unif'
,
theta_prior
=
{
'F0'
:
{
'type'
:
'unif'
,
'lower'
:
F0
-
DeltaF0
/
2.
,
'lower'
:
F0
-
DeltaF0
/
2.
,
'upper'
:
F0
+
DeltaF0
/
2.
},
'upper'
:
F0
+
DeltaF0
/
2.
},
...
...
Paper/DirectedMC/plot_data.py
View file @
2bf77d55
...
@@ -71,3 +71,10 @@ ax.legend(loc=1, frameon=False)
...
@@ -71,3 +71,10 @@ ax.legend(loc=1, frameon=False)
fig
.
tight_layout
()
fig
.
tight_layout
()
fig
.
savefig
(
'directed_recovery.png'
)
fig
.
savefig
(
'directed_recovery.png'
)
fig
,
ax
=
plt
.
subplots
()
ax
.
hist
(
df
.
runTime
,
bins
=
50
)
ax
.
set_xlabel
(
'runTime per follow-up [s]'
)
fig
.
savefig
(
'runTimeHist.png'
)
Paper/DirectedMC/submitfile
View file @
2bf77d55
...
@@ -7,6 +7,6 @@ Output=CollectedOutput/out.$(Process)
...
@@ -7,6 +7,6 @@ Output=CollectedOutput/out.$(Process)
Error=CollectedOutput/err.$(Process)
Error=CollectedOutput/err.$(Process)
Log=CollectedOutput/log.$(Process)
Log=CollectedOutput/log.$(Process)
request_cpus = 1
request_cpus = 1
request_memory =
16
GB
request_memory =
8
GB
Queue
1
00
Queue
4
00
Paper/directed_recovery.png
View replaced file @
0e89feb6
View file @
2bf77d55
50.2 KB
|
W:
|
H:
49.9 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment