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.

Sign up for GitHub

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

Various merges made into 1.x #29

Merged
merged 9 commits into from
Mar 16, 2023
Merged

Various merges made into 1.x #29

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a0c15e
Merge pull request #15 from TomGeorge1234/dev
TomGeorge1234 Jan 9, 2023
462aaa3
Merge pull request #16 from TomGeorge1234/dev
TomGeorge1234 Jan 9, 2023
ceb9f04
Merge pull request #23 from TomGeorge1234/dev
TomGeorge1234 Feb 5, 2023
ec84ef0
Merge pull request #25 from TomGeorge1234/dev
TomGeorge1234 Mar 7, 2023
07aae4e
fix bug when sampling points in a non-rectangular environment
frederikrogge Mar 16, 2023
eb3b0f0
Merge pull request #27 from TomGeorge1234/dev
TomGeorge1234 Mar 16, 2023
1e6d563
Merge branch '1.x' into 1.x
TomGeorge1234 Mar 16, 2023
7f2987c
Merge pull request #26 from frederikrogge/1.x
TomGeorge1234 Mar 16, 2023
bd35431
Merge pull request #28 from TomGeorge1234/dev
TomGeorge1234 Mar 16, 2023
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
6 changes: 3 additions & 3 deletions ratinabox/Environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ def sample_positions(self, n=10, method="uniform_jitter"):
elif self.dimensionality == "2D":

if method == "random":
positions = np.random.uniform(size=(n, 2))
positions[:, 0] *= self.extent[1] - self.extent[0]
positions[:, 1] *= self.extent[3] - self.extent[2]
positions = np.zeros((n, 2))
positions[:, 0] = np.random.uniform(self.extent[0], self.extent[1], size=n)
positions[:, 1] = np.random.uniform(self.extent[2], self.extent[3], size=n)
elif method[:7] == "uniform":
ex = self.extent
area = (ex[1] - ex[0]) * (ex[3] - ex[2])
Expand Down