Skip to content

Commit

Permalink
Log_likelihood update (TheAlgorithms#1008)
Browse files Browse the repository at this point in the history
* Add files via upload

This is a simple exploratory notebook that heavily expolits pandas and seaborn

* Update logistic_regression.py

* Update logistic_regression.py

* Rename Food wastage analysis from 1961-2013 (FAO).ipynb to other/Food wastage analysis from 1961-2013 (FAO).ipynb

* Update logistic_regression.py

* Update logistic_regression.py

* Update logistic_regression.py

* Update logistic_regression.py

* Update logistic_regression.py

* Update logistic_regression.py

* Update logistic_regression.py
  • Loading branch information
ChillOrb authored and cclauss committed Jul 13, 2019
1 parent d72586c commit 0d61539
Show file tree
Hide file tree
Showing 2 changed files with 5,933 additions and 11 deletions.
28 changes: 17 additions & 11 deletions machine_learning/logistic_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ def sigmoid_function(z):
def cost_function(h, y):
return (-y * np.log(h) - (1 - y) * np.log(1 - h)).mean()

def log_likelihood(X, Y, weights):
scores = np.dot(X, weights)
return np.sum(Y*scores - np.log(1 + np.exp(scores)) )

# here alpha is the learning rate, X is the feature matrix,y is the target matrix

def logistic_reg(
alpha,
X,
y,
num_steps,
max_iterations=70000,
):
converged = False
Expand All @@ -49,21 +52,24 @@ def logistic_reg(
h = sigmoid_function(z)
gradient = np.dot(X.T, h - y) / y.size
theta = theta - alpha * gradient

z = np.dot(X, theta)
h = sigmoid_function(z)
J = cost_function(h, y)

iterations += 1 # update iterations

if iterations == max_iterations:
print ('Maximum iterations exceeded!')
print ('Minimal cost function J=', J)
converged = True

weights = np.zeros(X.shape[1])
for step in range(num_steps):
scores = np.dot(X, weights)
predictions = sigmoid_function(scores)
if step % 10000 == 0:
print(log_likelihood(X,y,weights)) # Print log-likelihood every so often
return weights

if iterations == max_iterations:
print ('Maximum iterations exceeded!')
print ('Minimal cost function J=', J)
converged = True
return theta


# In[68]:

if __name__ == '__main__':
Expand All @@ -72,7 +78,7 @@ def logistic_reg(
y = (iris.target != 0) * 1

alpha = 0.1
theta = logistic_reg(alpha, X, y, max_iterations=70000)
theta = logistic_reg(alpha,X,y,max_iterations=70000,num_steps=30000)
print (theta)


Expand Down
Loading

0 comments on commit 0d61539

Please sign in to comment.