Skip to content
Snippets Groups Projects
Commit 68a50ca5 authored by Martin Bauer's avatar Martin Bauer
Browse files

Entropic

- version with weights in the entropy denominator
parent 815fe134
Branches
Tags
No related merge requests found
...@@ -83,9 +83,9 @@ class Field: ...@@ -83,9 +83,9 @@ class Field:
the outer loop loops over dimension 2, the second outer over dimension 1, and the inner loop the outer loop loops over dimension 2, the second outer over dimension 1, and the inner loop
over dimension 0. Also allowed: the strings 'numpy' (0,1,..d) or 'reverseNumpy' (d, ..., 1, 0) over dimension 0. Also allowed: the strings 'numpy' (0,1,..d) or 'reverseNumpy' (d, ..., 1, 0)
""" """
if layout == 'numpy' or layout == 'C': if layout == 'numpy' or layout.lower() == 'c':
layout = tuple(range(spatialDimensions)) layout = tuple(range(spatialDimensions))
elif layout == 'reverseNumpy' or layout == 'F': elif layout == 'reverseNumpy' or layout.lower() == 'f':
layout = tuple(reversed(range(spatialDimensions))) layout = tuple(reversed(range(spatialDimensions)))
if len(layout) != spatialDimensions: if len(layout) != spatialDimensions:
raise ValueError("Layout") raise ValueError("Layout")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment