Diffusion solar_potential e36467ca304c

Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential
e36467ca304c
Actions

Authored by rcastello on Apr 18 2018, 11:05.

Description

Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential

Details

Committed

rcastello

Apr 18 2018, 11:05

Pushed

rcastello

Apr 25 2019, 16:23

Parents

R8800:31707e55818a: t
R8800:94d25bb224d8: Couple of fixtures

Branches

Unknown

Tags

Unknown

Event Timeline

rcastello committed R8800:e36467ca304c: Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential (authored by rcastello).Apr 18 2018, 11:05

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
31707e55818a	Alina Walch	t	Apr 9 2018
3ecdd09993a0	Alina Walch	tests	Apr 8 2018
254924fb5532	Alina Walch	t	Apr 8 2018
8df7ec21cb63	Alina Walch	tests	Apr 8 2018
88535a8ad744	Alina Walch	tests	Apr 8 2018
229e2904f50d	Alina Walch	tests	Apr 8 2018
df762b611861	Alina Walch	tests	Apr 8 2018
b2446fcaa747	Alina Walch	tests	Apr 8 2018
7d6c9a22b6ec	Alina Walch	tests	Apr 8 2018
50663090916b	Alina Walch	cv	Apr 7 2018
814dd7eff710	Alina Walch	cv	Apr 7 2018
bb8bf7b71d99	Alina Walch	cv	Apr 7 2018
3fd3b391948c	Alina Walch	hdf5	Apr 7 2018
9ae6245ae5bf	Alina Walch	hdf5	Apr 7 2018
9a708439542c	Alina Walch	cv	Apr 7 2018
7fcbc3fe7c93	Alina Walch	RF tests 1;	Apr 6 2018
af1d1a084de0	Alina Walch	RF tests 1;	Apr 6 2018
87228234d99b	Alina Walch	file from 1M ds	Apr 6 2018
f890558c4a0a	Alina Walch	file from 1M ds	Apr 6 2018
3c87e9edc262	Alina Walch	file from 1M ds	Apr 6 2018
4c9ff11c4aff	Alina Walch	make all dataset	Apr 6 2018
1056d01a5992	Alina Walch	make all dataset	Apr 6 2018
8c860ff45b7d	Alina Walch	update	Apr 5 2018
99985394c13d	Alina Walch	changes	Apr 5 2018
e48503b8bc7d	Alina Walch	videos	Apr 5 2018
f8f0528ae305	Alina Walch	tsts	Apr 4 2018
f5e22e43a5a6	Alina Walch	testing random forests - round 2	Apr 4 2018
8fed101e68b1	Alina Walch	tests	Apr 4 2018
6a315f84a7ca	Alina Walch	tests	Apr 4 2018
9b4de8d3e18f	Alina Walch	tests	Apr 4 2018
593a5e970b17	Alina Walch	RF importance	Apr 4 2018
77d722c1367d	Alina Walch	RF tests	Apr 4 2018
faa2f64c993c	Alina Walch	RF importance	Apr 4 2018
7a7b3528bd30	Alina Walch	importances	Apr 4 2018
0b24861e8fd3	Alina Walch	RF importance tests	Apr 3 2018
6c82afccec9e	Alina Walch	plotting	Apr 3 2018
3b14168a27a5	Alina Walch	notebooks	Apr 3 2018
95fac491fa1f	Alina Walch	read pickles	Apr 1 2018
25c8a6b9f633	Alina Walch	read pickles	Apr 1 2018
1d5c837edf03	Alina Walch	read yearly	Mar 31 2018
fd9514feb8e1	Alina Walch	read yearly	Mar 31 2018
5ba95b23e6aa	Alina Walch	notebooks and yearly mean file	Mar 29 2018
89032459361b	Alina Walch	yearly means notebook	Mar 29 2018
dfa5fbb98076	Alina Walch	benchmark test	Mar 28 2018
8fa6bc79dc17	Alina Walch	RF_tests	Mar 28 2018
953fed94b1ad	Alina Walch	notebooks	Mar 28 2018
71ffc34630e0	Alina Walch	loc_all mask	Mar 28 2018
0a1d0c92e379	Alina Walch	RF_tests	Mar 28 2018
16aee584f65f	Alina Walch	RF_tests	Mar 28 2018
4261bc25a6a7	Alina Walch	RF_tests	Mar 28 2018

Changes (106)

				Path
	M			.gitignore
	D			Solar/.DS_Store
	P			Solar/.ipynb_checkpoints/DEM13d-checkpoint.ipynb Copied from Solar/.ipynb_checkpoints/Error-checkpoint.ipynb
	P			Solar/.ipynb_checkpoints/Error-checkpoint.ipynb Deleted after being copied to multiple locations: Solar/.ipynb_checkpoints/DEM13d-checkpoint.ipynb Solar/.ipynb_checkpoints/HPELM_validation-checkpoint.ipynb Solar/.ipynb_checkpoints/Plotly_tests-checkpoint.ipynb Solar/.ipynb_checkpoints/RF_ranking-checkpoint.ipynb Solar/.ipynb_checkpoints/make_yearly_means-checkpoint.ipynb
	P			Solar/.ipynb_checkpoints/HPELM_validation-checkpoint.ipynb Copied from Solar/.ipynb_checkpoints/Error-checkpoint.ipynb
	D			Solar/.ipynb_checkpoints/Merge_data-checkpoint.ipynb
	P			Solar/.ipynb_checkpoints/Plotly_tests-checkpoint.ipynb Copied from Solar/.ipynb_checkpoints/Error-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Plotting-checkpoint.ipynb
	P			Solar/.ipynb_checkpoints/RF_ranking-checkpoint.ipynb Copied from Solar/.ipynb_checkpoints/Error-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/RF_variableImportance-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Random_Forest-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Spielwiese - datasets-checkpoint.ipynb
	M			Solar/.ipynb_checkpoints/Spielwiese - reader-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Visualisation-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Visualisation-raw-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/Visualisation-real-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/make_benchmark_test-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/make_features-checkpoint.ipynb
	A			Solar/.ipynb_checkpoints/make_locmask-checkpoint.ipynb
	V			Solar/.ipynb_checkpoints/{make_yearly_means-checkpoint.ipynb ← Error-checkpoint.ipynb}
	A			Solar/DEM13d.ipynb
	A			Solar/ELM-CV.ipynb
	A			Solar/ELM-CV.py
	D			Solar/Error.ipynb
	M			Solar/HPELM.ipynb
	A			Solar/HPELM_validation.ipynb
	D			Solar/Merge_data.ipynb
	A			Solar/Plotly_tests.ipynb
	A			Solar/Plotting.ipynb
	A			Solar/RF_importance_all.py
	A			Solar/RF_ranking.ipynb
	A			Solar/RF_tests.py
	A			Solar/RF_tests_2.py
	A			Solar/RF_tests_3.py
	A			Solar/RF_tests_idx.csv
	A			Solar/RF_variableImportance.ipynb
	A			Solar/RF_variableImportance.py
	D			Solar/Radiation_Reader.pyc
	A			Solar/Random_Forest.ipynb
	A			Solar/Spielwiese - datasets.ipynb
	M			Solar/Spielwiese - reader.ipynb
	A			Solar/Untitled.ipynb
	A			Solar/Visualisation-raw.ipynb
	A			Solar/Visualisation-real.ipynb
	A			Solar/Visualisation.ipynb
	D			Solar/__pycache__
	D			Solar/__pycache__/Radiation_Reader.cpython-36.pyc
	D			Solar/__pycache__/ds.cpython-36.pyc
	D			Solar/__pycache__/features.cpython-36.pyc
	D			Solar/__pycache__/features_new.cpython-36.pyc
	D			Solar/__pycache__/meteo_data.cpython-36.pyc
	D			Solar/__pycache__/meteo_raw.cpython-36.pyc
	D			Solar/__pycache__/norms.cpython-36.pyc
	D			Solar/__pycache__/read_radiation.cpython-36.pyc
	D			Solar/__pycache__/util.cpython-36.pyc
	M			Solar/ds.py
	D			Solar/ds.pyc
	A			Solar/ensemble-CV.py
	A			Solar/ensemble-cv.ipynb
	A			Solar/ensemble-cv.py
	A			Solar/ensemble-cv2.py
	A			Solar/ensemble-cv3D.py
	A			Solar/ensemble-cv6D.py
	A			Solar/ensemble-elm.py
	A			Solar/ensemble-elm2.py
	A			Solar/ensemble-elm3.py
	M			Solar/features.py
	D			Solar/features.pyc
	A			Solar/importances.csv
	A			Solar/importances_all.csv
	A			Solar/inds.csv
	A			Solar/inds_all.csv
	A			Solar/locations/all.txt
	A			Solar/log.txt
	A			Solar/make_1M_dataset.ipynb
	A			Solar/make_1M_dataset.py
	A			Solar/make_benchmark_test.ipynb
	M			Solar/make_dataset.ipynb
	A			Solar/make_features.ipynb
	A			Solar/make_locmask.ipynb
	A			Solar/make_yearly_mean.py
	A			Solar/make_yearly_means.ipynb
	A			Solar/make_yearly_means.py
	M			Solar/meteo_data.py
	D			Solar/meteo_data.pyc
	M			Solar/meteo_raw.py
	D			Solar/meteo_raw.pyc
	A			Solar/nohup.out
	M			Solar/normalize_n_split.ipynb
	D			Solar/norms.pyc
	A			Solar/permutations_and_rand_t.png
	A			Solar/permutations_t.png
	A			Solar/permutations_t.txt
	A			Solar/quick.py
	A			Solar/random_timings.ipynb
	M			Solar/reader_subsets_plotting.ipynb
	A			Solar/remake_1Msample.py
	P			Solar/renormalize_targets.py Copied from Solar/train.py
	A			Solar/stds.csv
	A			Solar/stds_all.csv
	P			Solar/train.py Copied to multiple locations: Solar/renormalize_targets.py Solar/train_KI.py
	P			Solar/train_KI.py Copied from Solar/train.py
	D			Solar/tst.csv
	M			Solar/util.py
	D			Solar/util.pyc
	A			Solar/yearly_sum.csv