Diffusion solar_potential c30254575246

Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential Alina's…
c30254575246
Actions

Authored by rcastello on Mar 7 2018, 16:20.

Description

Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential Alina's new notebook guide features

Details

Committed

rcastello

Mar 7 2018, 16:20

Pushed

rcastello

Apr 25 2019, 16:23

Parents

R8800:c8213a4e2b29: Adding my notebook for plotting
R8800:809ed8e432a5: scripts to make datasets

Branches

Unknown

Tags

Unknown

Event Timeline

rcastello committed R8800:c30254575246: Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential Alina's… (authored by rcastello).Mar 7 2018, 16:20

Merged Changes

Commit	Author	Details	Committed
809ed8e432a5	Alina Walch	scripts to make datasets	Mar 7 2018
dcf91d13adf9	Alina Walch	add	Mar 7 2018
b1f94740f876	Alina Walch	finished guide_features	Mar 6 2018
d0c9f36657b6	Walch Alina Ursula Rosa	update	Mar 6 2018
e047c53f83b0	Walch Alina Ursula Rosa	FINISHED PREP	Mar 2 2018
89949faaa246	Walch Alina Ursula Rosa	playing around	Mar 1 2018

Changes (38)

				Path
	A			Solar/.ipynb_checkpoints/Error-checkpoint.ipynb
	P			Solar/.ipynb_checkpoints/Spielwiese - reader-checkpoint.ipynb Copied from Solar/Spielwiese - reader.ipynb
	A			Solar/.ipynb_checkpoints/guide_features-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/normalize_n_split-checkpoint.ipynb
	A			Solar/Error.ipynb
	M			Solar/HPELM.ipynb
	P			Solar/Spielwiese - reader.ipynb Copied to Solar/.ipynb_checkpoints/Spielwiese - reader-checkpoint.ipynb
	M			Solar/__pycache__/features.cpython-36.pyc
	A			Solar/__pycache__/features_new.cpython-36.pyc
	M			Solar/__pycache__/meteo_data.cpython-36.pyc
	A			Solar/__pycache__/norms.cpython-36.pyc
	M			Solar/__pycache__/util.cpython-36.pyc
	A			Solar/features.csv
	P			Solar/features.py Copied to Solar/features_old.py
	A			Solar/features.pyc
	P			Solar/features_old.py Copied from Solar/features.py
	A			Solar/guide_features.ipynb
	A			Solar/guide_features.py
	M			Solar/guide_meteo.ipynb
	A			Solar/locations.csv
	A			Solar/locations/.DS_Store
	P			Solar/locations/all_test.txt Copied from Solar/locations/grid100.txt
	P			Solar/locations/all_train.txt Copied from Solar/locations/grid100.txt
	P			Solar/locations/grid100_test.txt Copied from Solar/locations/rand100.txt
	P			Solar/locations/grid100_train.txt Copied from Solar/locations/grid100.txt
	P			Solar/locations/rand100_test.txt Copied from Solar/locations/rand100.txt
	P			Solar/locations/rand100_train.txt Copied from Solar/locations/rand100.txt
	M			Solar/make_dataset.ipynb
	M			Solar/meteo_data.py
	A			Solar/meteo_data.pyc
	A			Solar/meteo_raw.pyc
	A			Solar/normalize_n_split.ipynb
	A			Solar/norms.py
	A			Solar/norms.pyc
	A			Solar/test.py
	A			Solar/train.py
	M			Solar/util.py
	M			Solar/util.pyc