Skip to content

Removed merge conflicts #4

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
HimaVarsha94 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed merge conflicts #4

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
13 changes: 1 addition & 12 deletions misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,13 @@ def build_confusion_matrix(X,Y,model):
for i,xs in enumerate(X):
y = make_sentiment_idx(Y[i])
y_hat = make_sentiment_idx(model.predict(xs))
<<<<<<< HEAD
=======

#print y
#print y_hat
#print "\n \n"
>>>>>>> fc44c6ed5cd7354852b4e6888885fc5914ffb92f
for t in range(len(y)):
true_label=y[t]+floor(SENT_DIM/2)
guessed_label=y_hat[t]+floor(SENT_DIM/2)

conf_arr[true_label,guessed_label]+=1
print conf_arr
<<<<<<< HEAD
return calc_accuracy(conf_arr)
=======
calc_accuracy(conf_arr)
>>>>>>> fc44c6ed5cd7354852b4e6888885fc5914ffb92f

#makeconf(conf_arr)

def makeconf(conf_arr):
Expand Down