Skip to content

fix np.int bug, update readme to working ex #2

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

Open
michaelmoschitto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix np.int bug, update readme to working ex #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 30 additions & 21 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,44 +64,53 @@ The outputs are:
Example implementation
```
from augmentdata import data_augment

l=[
[1.0,2.0,1.0,0],
'''
x^2 + y^2 + z^2 < 15 => 0
x^2 + y^2 + z^2 >= 15 => 1
'''
l=[

[1.0,2.0,1.0,0],
[1,3,1,0],
[2,1,1,0],
[3,2,1,0],
[3,1,1,0],

[1,3,4,1],
[1,4,3,1],
[1,4,4,1],

[2,3,3,1],
[2,3,4,1],
[2,4,3,1],
[2,4,4,1],

[3,2,2,1],
[3,3,2,1],
[3,3,2,1],
[3,4,2,1],

[4,3,1,1]
]

l=np.array(l)
print("Original Data:")
print(l)
X=l[:,:-1]
y=l[:,-1]



knnor = data_augment.KNNOR()
knnor=KNNOR()
X_new,y_new=knnor.fit_resample(X,y)
y_new=y_new.reshape(-1,1)

print("KNNOR Data:")
new_data=np.append(X_new, y_new, axis=1)
print(new_data)
]

l=np.array(l)
X=l[:,:-1]
y=l[:,-1]
print("X=",X.shape,"y=",y.shape)
print("Original Data:")
print(l)
print("************************************")


knnor=KNNOR()
X_new,y_new,_,_=knnor.fit_resample(X,y)
y_new=y_new.reshape(-1,1)
print(X_new.shape,y_new.shape)

print("KNNOR Data:")
new_data=np.append(X_new, y_new, axis=1)
print(new_data)
print("************************************")
```
Output
```
Expand Down
4 changes: 2 additions & 2 deletions knnor/data_augment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ def savitzky_golay(self,y, window_size, order, deriv=0, rate=1):
from math import factorial

try:
window_size = np.abs(np.int(window_size))
order = np.abs(np.int(order))
window_size = np.abs(int(window_size))
order = np.abs(int(order))
except ValueError:
raise ValueError("window_size and order have to be of type int")
if window_size % 2 != 1 or window_size < 1:
Expand Down