Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
10
Issues
10
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
e95a573a
Commit
e95a573a
authored
Jul 18, 2017
by
Theo Steininger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Branch_master' into 'master'
Added dtype option to prober. See merge request
!169
parents
3a1a4975
b81cb205
Pipeline
#15049
passed with stages
in 13 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
nifty/minimization/line_searching/line_search.py
nifty/minimization/line_searching/line_search.py
+0
-3
nifty/probing/prober/prober.py
nifty/probing/prober/prober.py
+4
-1
No files found.
nifty/minimization/line_searching/line_search.py
View file @
e95a573a
...
...
@@ -44,9 +44,6 @@ class LineSearch(Loggable, object):
__metaclass__
=
abc
.
ABCMeta
def
__init__
(
self
):
self
.
line_energy
=
None
self
.
f_k_minus_1
=
None
self
.
preferred_initial_step_size
=
None
...
...
nifty/probing/prober/prober.py
View file @
e95a573a
...
...
@@ -37,7 +37,8 @@ class Prober(object):
"""
def
__init__
(
self
,
domain
=
None
,
distribution_strategy
=
None
,
probe_count
=
8
,
random_type
=
'pm1'
,
compute_variance
=
False
):
random_type
=
'pm1'
,
probe_dtype
=
np
.
float
,
compute_variance
=
False
):
self
.
_domain
=
utilities
.
parse_domain
(
domain
)
self
.
_distribution_strategy
=
\
...
...
@@ -45,6 +46,7 @@ class Prober(object):
self
.
_probe_count
=
self
.
_parse_probe_count
(
probe_count
)
self
.
_random_type
=
self
.
_parse_random_type
(
random_type
)
self
.
compute_variance
=
bool
(
compute_variance
)
self
.
probe_dtype
=
np
.
dtype
(
probe_dtype
)
# ---Properties---
...
...
@@ -104,6 +106,7 @@ class Prober(object):
""" a random-probe generator """
f
=
Field
.
from_random
(
random_type
=
self
.
random_type
,
domain
=
self
.
domain
,
dtype
=
self
.
probe_dtype
,
distribution_strategy
=
self
.
distribution_strategy
)
uid
=
np
.
random
.
randint
(
1e18
)
return
(
uid
,
f
)
...
...
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