Diffusion solar_potential d62778424533

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

Authored by rcastello on May 11 2018, 09:33.

Description

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

Details

Committed

rcastello

May 11 2018, 09:33

Pushed

rcastello

Apr 25 2019, 16:23

Parents

R8800:840980169685: uncertsinties RF in fucntion
R8800:837db38ae432: Updated scripts for sbatch submission

Branches

Unknown

Tags

Unknown

Event Timeline

rcastello committed R8800:d62778424533: Merge remote-tracking branch 'origin/aw_solar' into rc_energy_potential (authored by rcastello).May 11 2018, 09:33

Merged Changes

Commit	Author	Details	Committed
840980169685	Alina Walch	uncertsinties RF in fucntion	May 9 2018
dd1c0248d00d	Alina Walch	cleaned up repository	May 9 2018
db23139069e8	Alina Walch	deleting tmp files	May 9 2018
34899078aff1	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
9267a675229d	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
624f463e7196	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
0b8be05dde3e	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
b650bf0c4f5e	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
2e2359ce0fbb	Alina Walch	ensemble with uncertainites in function for deneb	May 9 2018
6ebe41a4ac6b	Alina Walch	elm uncertainties python script	May 4 2018
438107c33024	Alina Walch	uncertainties work (for me)	May 2 2018
f3b680849b8a	Alina Walch	vis tweak	May 2 2018
a03a94a0c1e6	Alina Walch	vis tweak	May 2 2018
8d02df8e8741	Alina Walch	vis tweak	May 2 2018
c407ac45202a	Alina Walch	Merge branch 'aw_solar' of gitlab.epfl.ch:EPFL-LESOPB/energy-potential into…	May 2 2018
5a868f7ef052	Alina Walch	vis tweak	May 2 2018
e37b7305b639	Alina Walch	RF works	May 2 2018
0e070fa4a89a	Alina Walch	changes	May 2 2018

Changes (158)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
A		Solar/.DS_Store
P		Solar/.ipynb_checkpoints/ELM-CV-checkpoint.ipynb Copied from Solar/ELM-CV.ipynb
P		Solar/.ipynb_checkpoints/ELM_uncertainties-checkpoint.ipynb Copied from Solar/ELM_uncertainties.ipynb
D		Solar/.ipynb_checkpoints/HPELM-checkpoint.ipynb
P		Solar/.ipynb_checkpoints/Plotly_tests-checkpoint.ipynb Deleted after being copied to multiple locations: Solar/.ipynb_checkpoints/Plotting errors-checkpoint.ipynb Solar/.ipynb_checkpoints/make_KI_datasets-checkpoint.ipynb
P		Solar/.ipynb_checkpoints/Plotting errors-checkpoint.ipynb Copied from Solar/.ipynb_checkpoints/Plotly_tests-checkpoint.ipynb
P		Solar/.ipynb_checkpoints/RF_uncertainties-checkpoint.ipynb Copied from Solar/RF_uncertainties.ipynb
V		Solar/{ → deprecated}/.ipynb_checkpoints/Random_Forest-checkpoint.ipynb
V		Solar/{ → deprecated}/.ipynb_checkpoints/Spielwiese - datasets-checkpoint.ipynb
V		Solar/{ → deprecated}/.ipynb_checkpoints/Spielwiese - reader-checkpoint.ipynb
P		Solar/.ipynb_checkpoints/ensemble-cv-checkpoint.ipynb Copied from Solar/ensemble-cv.ipynb
P		Solar/.ipynb_checkpoints/make_1M_dataset-checkpoint.ipynb Copied from Solar/make_1M_dataset.ipynb
V		Solar/.ipynb_checkpoints/{make_KI_datasets-checkpoint.ipynb ← Plotly_tests-checkpoint.ipynb}
V		Solar/{ → deprecated}/.ipynb_checkpoints/make_benchmark_test-checkpoint.ipynb
V		Solar/{ → preprocessing}/.ipynb_checkpoints/make_dataset-checkpoint.ipynb
V		Solar/{ → preprocessing}/.ipynb_checkpoints/make_features-checkpoint.ipynb
V		Solar/{ → preprocessing}/.ipynb_checkpoints/make_locmask-checkpoint.ipynb
V		Solar/{ → deprecated}/.ipynb_checkpoints/normalize_n_split-checkpoint.ipynb
A		Solar/.ipynb_checkpoints/random_timings-checkpoint.ipynb
V		Solar/{ → deprecated}/.ipynb_checkpoints/reader_subsets_plotting-checkpoint.ipynb
V		Solar/{ → preprocessing}/DEM13d.ipynb
P		Solar/ELM-CV.ipynb Deleted after being copied to multiple locations: Solar/.ipynb_checkpoints/ELM-CV-checkpoint.ipynb Solar/deprecated/ELM-CV.ipynb
V		Solar/{ → deprecated}/ELM-CV.py
V		Solar/{ELM-ensemble.py → ELM_ensemble.py}
V		Solar/{ELM_ensemble.py ← ELM-ensemble.py}
P		Solar/ELM_uncertainties.ipynb Copied to Solar/.ipynb_checkpoints/ELM_uncertainties-checkpoint.ipynb
A		Solar/ELM_uncertainties.py
A		Solar/ELM_uncertainties_query.py
A		Solar/ELM_uncertainties_train.py
D		Solar/HPELM.ipynb
D		Solar/Plotly_tests.ipynb
V		Solar/{ → plotting}/Plotting errors.ipynb
V		Solar/{ → plotting}/Plotting.ipynb
V		Solar/{ → deprecated}/RF_tests.py
V		Solar/{ → deprecated}/RF_tests_2.py
D		Solar/RF_tests_idx.csv
P		Solar/RF_uncertainties.ipynb Copied to Solar/.ipynb_checkpoints/RF_uncertainties-checkpoint.ipynb
A		Solar/RF_uncertainties.py
M		Solar/RF_variableImportance.ipynb
V		Solar/{ → deprecated}/Radiation_Reader.py
V		Solar/{ → deprecated}/Random_Forest.ipynb
V		Solar/{ → deprecated}/Spielwiese - datasets.ipynb
V		Solar/{ → deprecated}/Spielwiese - reader.ipynb
V		Solar/{ → plotting}/Visualisation-raw.ipynb
V		Solar/{ → plotting}/Visualisation-real.ipynb
V		Solar/{ → plotting}/Visualisation.ipynb
A	(dir)	Solar/deprecated/
A		Solar/deprecated/.DS_Store
A	(dir)	Solar/deprecated/.ipynb_checkpoints/
V		Solar/{deprecated ← }/.ipynb_checkpoints/Random_Forest-checkpoint.ipynb
V		Solar/{deprecated ← }/.ipynb_checkpoints/Spielwiese - datasets-checkpoint.ipynb
V		Solar/{deprecated ← }/.ipynb_checkpoints/Spielwiese - reader-checkpoint.ipynb
V		Solar/{deprecated ← }/.ipynb_checkpoints/make_benchmark_test-checkpoint.ipynb
V		Solar/{deprecated ← }/.ipynb_checkpoints/normalize_n_split-checkpoint.ipynb
V		Solar/{deprecated ← }/.ipynb_checkpoints/reader_subsets_plotting-checkpoint.ipynb
V		Solar/{deprecated ← }/ELM-CV.ipynb
V		Solar/{deprecated ← }/ELM-CV.py
V		Solar/{deprecated ← }/RF_tests.py
V		Solar/{deprecated ← }/RF_tests_2.py
V		Solar/{deprecated ← }/Radiation_Reader.py
V		Solar/{deprecated ← }/Random_Forest.ipynb
V		Solar/{deprecated ← }/Spielwiese - datasets.ipynb
V		Solar/{deprecated ← }/Spielwiese - reader.ipynb
V		Solar/{deprecated ← }/ds_old.py
V		Solar/{deprecated ← }/ensemble-CV.py
V		Solar/{deprecated ← }/ensemble-cv.ipynb
V		Solar/{deprecated ← }/ensemble-cv2.py
V		Solar/{deprecated ← }/ensemble-cv3D.py
V		Solar/{deprecated ← }/ensemble-cv6D.py
V		Solar/{deprecated ← }/ensemble-elm.py
V		Solar/{deprecated ← }/ensemble-elm2.py
V		Solar/{deprecated ← }/features_old.py
V		Solar/{deprecated ← }/guide_features.py
V		Solar/{deprecated ← }/make_1M_dataset.py
V		Solar/{deprecated ← }/make_benchmark_test.ipynb
V		Solar/{deprecated ← }/make_yearly_means.ipynb
V		Solar/{deprecated ← }/make_yearly_means.py
V		Solar/{deprecated ← }/normalize_n_split.ipynb
V		Solar/{deprecated ← }/quick.py
V		Solar/{deprecated ← }/reader_subsets_plotting.ipynb
V		Solar/{deprecated ← }/remake_1Msample.py
V		Solar/{deprecated ← }/renormalize_targets.py
V		Solar/{deprecated ← }/test.py
V		Solar/{deprecated ← }/train.py
V		Solar/{deprecated ← }/train_KI.py
V		Solar/{ → deprecated}/ds_old.py
V		Solar/{ → deprecated}/ensemble-CV.py
P		Solar/ensemble-cv.ipynb Deleted after being copied to multiple locations: Solar/.ipynb_checkpoints/ensemble-cv-checkpoint.ipynb Solar/deprecated/ensemble-cv.ipynb
D		Solar/ensemble-cv.py
V		Solar/{ → deprecated}/ensemble-cv2.py
V		Solar/{ → deprecated}/ensemble-cv3D.py
V		Solar/{ → deprecated}/ensemble-cv6D.py
V		Solar/{ → deprecated}/ensemble-elm.py
V		Solar/{ → deprecated}/ensemble-elm2.py
D		Solar/features.csv
V		Solar/{ → deprecated}/features_old.py
V		Solar/{ → deprecated}/guide_features.py
D		Solar/importances.csv
D		Solar/importances_all.csv
D		Solar/inds.csv
D		Solar/inds_all.csv
V		Solar/{ → locations}/locations.csv
V		Solar/{locations ← }/locations.csv
D		Solar/log.txt
P		Solar/make_1M_dataset.ipynb Deleted after being copied to multiple locations: Solar/.ipynb_checkpoints/make_1M_dataset-checkpoint.ipynb Solar/preprocessing/make_1M_dataset.ipynb
V		Solar/{ → deprecated}/make_1M_dataset.py
V		Solar/{ → preprocessing}/make_KI.py
V		Solar/{ → preprocessing}/make_KI_datasets.ipynb
V		Solar/{ → deprecated}/make_benchmark_test.ipynb
V		Solar/{ → preprocessing}/make_dataset.ipynb
V		Solar/{make_datasets.sh ← tst_bash.sh}
V		Solar/{ → preprocessing}/make_features.ipynb
V		Solar/{ → preprocessing}/make_locmask.ipynb
D		Solar/make_yearly_mean.py
V		Solar/{ → deprecated}/make_yearly_means.ipynb
V		Solar/{ → deprecated}/make_yearly_means.py
D		Solar/nohup.out
V		Solar/{ → deprecated}/normalize_n_split.ipynb
M		Solar/norms.py
D		Solar/permutations_and_rand_t.png
D		Solar/permutations_t.png
D		Solar/permutations_t.txt
A	(dir)	Solar/plotting/
V		Solar/{plotting ← }/Plotting errors.ipynb
V		Solar/{plotting ← }/Plotting.ipynb
V		Solar/{plotting ← }/Visualisation-raw.ipynb
V		Solar/{plotting ← }/Visualisation-real.ipynb
V		Solar/{plotting ← }/Visualisation.ipynb
V		Solar/{plotting ← }/visualise_spacetime.py
A	(dir)	Solar/preprocessing/
A	(dir)	Solar/preprocessing/.ipynb_checkpoints/
V		Solar/{preprocessing ← }/.ipynb_checkpoints/make_dataset-checkpoint.ipynb
V		Solar/{preprocessing ← }/.ipynb_checkpoints/make_features-checkpoint.ipynb
V		Solar/{preprocessing ← }/.ipynb_checkpoints/make_locmask-checkpoint.ipynb
V		Solar/{preprocessing ← }/DEM13d.ipynb
V		Solar/{preprocessing ← }/make_1M_dataset.ipynb
V		Solar/{preprocessing ← }/make_KI.py
V		Solar/{preprocessing ← }/make_KI_datasets.ipynb
V		Solar/{preprocessing ← }/make_dataset.ipynb
V		Solar/{preprocessing ← }/make_features.ipynb
V		Solar/{preprocessing ← }/make_locmask.ipynb
V		Solar/{pythons.sh → test_ELM_ensemble.sh}
V		Solar/{ → deprecated}/quick.py
V		Solar/{ → deprecated}/reader_subsets_plotting.ipynb
V		Solar/{ → deprecated}/remake_1Msample.py
V		Solar/{ → deprecated}/renormalize_targets.py
D		Solar/stds.csv
D		Solar/stds_all.csv
V		Solar/{ → deprecated}/test.py
V		Solar/{test_ELM_ensemble.sh ← pythons.sh}
V		Solar/{ → deprecated}/train.py
V		Solar/{ → deprecated}/train_KI.py
D		Solar/tst.py
V		Solar/{tst_bash.sh → make_datasets.sh}
M		Solar/util.py
V		Solar/{ → plotting}/visualise_spacetime.py
D		Solar/yearly_sum.csv