Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PyFstat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gregory Ashton
PyFstat
Commits
9f8d0be1
Commit
9f8d0be1
authored
7 years ago
by
David Keitel
Browse files
Options
Downloads
Patches
Plain Diff
gridsearch: fix old-data check in transient case, add filenames to logging
parent
0c41b602
No related branches found
No related tags found
1 merge request
!8
add transient F(t0,tau) file output
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pyfstat/grid_based_searches.py
+4
-4
4 additions, 4 deletions
pyfstat/grid_based_searches.py
with
4 additions
and
4 deletions
pyfstat/grid_based_searches.py
+
4
−
4
View file @
9f8d0be1
...
...
@@ -128,7 +128,7 @@ class GridSearch(BaseSearchClass):
if
args
.
clean
:
return
False
if
os
.
path
.
isfile
(
self
.
out_file
)
is
False
:
logging
.
info
(
'
No old data found, continuing with grid search
'
)
logging
.
info
(
'
No old data found
in
"
{:s}
"
, continuing with grid search
'
.
format
(
self
.
out_file
)
)
return
False
if
self
.
sftfilepattern
is
not
None
:
oldest_sft
=
min
([
os
.
path
.
getmtime
(
f
)
for
f
in
...
...
@@ -139,13 +139,13 @@ class GridSearch(BaseSearchClass):
return
False
data
=
np
.
atleast_2d
(
np
.
genfromtxt
(
self
.
out_file
,
delimiter
=
'
'
))
if
np
.
all
(
data
[:,
0
:
-
1
]
==
self
.
input_data
):
if
np
.
all
(
data
[:,
0
:
len
(
self
.
coord_arrays
)]
==
self
.
input_data
[:,
0
:
len
(
self
.
coord_arrays
)]
):
logging
.
info
(
'
Old data found with matching input, no search performed
'
)
'
Old data found
in
"
{:s}
"
with matching input, no search performed
'
.
format
(
self
.
out_file
)
)
return
data
else
:
logging
.
info
(
'
Old data found, input differs, continuing with grid search
'
)
'
Old data found
in
"
{:s}
"
, input differs, continuing with grid search
'
.
format
(
self
.
out_file
)
)
return
False
return
False
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment