Skip to content

Commit

Permalink
Cleaned up some code
Browse files Browse the repository at this point in the history
  • Loading branch information
Saad-Mufti committed Nov 22, 2019
1 parent 8ee1693 commit 4486d62
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions Energy Plants.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,23 @@
print(without_elec)

dataset = dataset.drop_duplicates(subset='GPS')
# dataset = dataset[['GPS', 'ES3']]
dataset.append(without_elec)

print('Dataset has', len(dataset))

#TODO: Use bigger dataset instead so can get trues and falses. Then apply algo

# bools[['Elec_access']] = dataset[['ES3']] != 7
# print(bools)
# print(bools.loc[bools['Elec_access'] == False])
bools = list(without_elec['Elec_access'])
dataset = dataset[['GPS']]
# print(bools)
dataset_sample = pd.concat([without_elec[['GPS']], dataset.sample(8)])
print(dataset_sample)
# dataset_sample = dataset_sample[['GPS']]
dataset_sample[['Latitude', 'Longitude']] = dataset_sample['GPS'].str.split(',', expand=True)
dataset_sample = dataset_sample.drop(['GPS'], axis=1)
print(dataset_sample)

distance_matrix = np.array(dataset_sample[['Latitude', 'Longitude']])
# print(distance_matrix)
# print(m_dist)

dist = pd.DataFrame(distances_dataset(dataset_sample.values,
lambda u, v: geopy.distance.distance(u, v).kilometers), index=dataset_sample.index, columns=dataset_sample.index)
print(dist)
# print(dist.iloc[0,:])

hamiltonian = hamiltonian_from_distances(dist)
timesteps = 3
Expand All @@ -60,7 +49,6 @@
gammas_singles = [round(val,1) for val in np.random.rand(0)]
gammas_pairs = [round(val,1) for val in np.random.rand(timesteps*len(hamiltonian))]


hyperparameters = (hamiltonian, timesteps)
parameters = (betas, gammas_singles, gammas_pairs)

Expand All @@ -72,8 +60,6 @@
sim=sim,
enable_logging=True)



def run_qaoa(hamiltonian, params, timesteps, max_iters, init_state=None):
cost_function = QAOACostFunctionOnWFSim(hamiltonian,
params=params,
Expand Down

0 comments on commit 4486d62

Please sign in to comment.