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

Removed unnecessary aliasing of OneDimensionalArray #161 #165

Merged
merged 4 commits into from
Mar 17, 2020
Merged

Removed unnecessary aliasing of OneDimensionalArray #161 #165

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
778247f
Removed unnecessary aliasing of OneDimensionalArray #161
ShebinJoseph Mar 17, 2020
21ce81f
<interchanged ODA with OneDimensionalArray
ShebinJoseph Mar 17, 2020
492fe98
Update pydatastructs/linear_data_structures/arrays.py
czgdp1807 Mar 17, 2020
3fa61f2
Update pydatastructs/linear_data_structures/arrays.py
czgdp1807 Mar 17, 2020
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
11 changes: 5 additions & 6 deletions pydatastructs/linear_data_structures/arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pydatastructs.utils.misc_util import _check_type, NoneType
from pydatastructs.utils.misc_util import NoneType, _check_type
czgdp1807 marked this conversation as resolved.
Show resolved Hide resolved

__all__ = [
'OneDimensionalArray',
Expand Down Expand Up @@ -48,8 +48,8 @@ class OneDimensionalArray(Array):
Examples
========

>>> from pydatastructs import OneDimensionalArray as ODA
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe doctest is failing because u removed the import.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be restored.

>>> arr = ODA(int, 5)
>>> from pydatastructs import OneDimensionalArray
>>> arr = OneDimensionalArray(int, 5)
>>> arr.fill(6)
>>> arr[0]
6
Expand Down Expand Up @@ -127,7 +127,6 @@ def fill(self, elem):
for i in range(self._size):
self._data[i] = elem

ODA = OneDimensionalArray

class DynamicArray(Array):
"""
Expand Down Expand Up @@ -216,7 +215,7 @@ def _modify(self):
below load factor.
"""
if self._num/self._size < self._load_factor:
arr_new = ODA(self._dtype, 2*self._num + 1)
arr_new = OneDimensionalArray(self._dtype, 2*self._num + 1)
j = 0
for i in range(self._last_pos_filled + 1):
if self[i] is not None:
Expand All @@ -228,7 +227,7 @@ def _modify(self):

def append(self, el):
if self._last_pos_filled + 1 == self._size:
arr_new = ODA(self._dtype, 2*self._size + 1)
arr_new = OneDimensionalArray(self._dtype, 2*self._size + 1)
for i in range(self._last_pos_filled + 1):
arr_new[i] = self[i]
arr_new[self._last_pos_filled + 1] = el
Expand Down