From 48acd629923e19f1957fe34e21fe0530de8a46e0 Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Wed, 9 Nov 2016 16:23:22 +0100 Subject: [PATCH] 'update' --- .../stage2/src}/00_convertir-donnnes_2009.r | 0 .../stage2/src}/00_convertir-donnnes_2010.r | 0 .../stage2/src}/00_convertir-donnnes_2011.r | 0 .../stage2/src}/00_createCalendar.r | 0 .../stage2/src}/00_plots-energycon.r | 0 {codes_Jairo_stage2 => code/stage2/src}/01_StBr.r | 0 .../stage2/src}/01_extract-features2_2009.r | 0 .../stage2/src}/01_extract-features_2009.r | 0 .../stage2/src}/01_extract-features_2010.r | 0 .../stage2/src}/02_cluster-par_2009.r | 0 {codes_Jairo_stage2 => code/stage2/src}/02_cluster_2009.r | 0 .../stage2/src}/03_compute-sums-of-classes-par_2009.r | 0 .../src}/03_compute-sums-of-classesRANDOM-par_2009.r | 0 .../stage2/src}/03_compute-sums-of-classesRANDOM_2009.r | 0 .../stage2/src}/03_compute-sums-of-classesRANDOM_2010.r | 0 .../stage2/src}/03_compute-sums-of-classes_2009.r | 0 .../stage2/src}/03_compute-sums-of-classes_2010-par.r | 0 .../stage2/src}/03_compute-sums-of-classes_2010.r | 0 {codes_Jairo_stage2 => code/stage2/src}/04_predictions.r | 0 {codes_Jairo_stage2 => code/stage2/src}/05_cluster2step.r | 0 .../stage2/src}/05_cluster2stepWER-RANDOM.r | 0 .../stage2/src}/05_cluster2stepWER-par.r | 0 .../stage2/src}/05_cluster2stepWER.r | 0 .../stage2/src}/06_predictions-ICAME.r | 0 .../stage2/src}/06_predictions-RANDOM.r | 0 .../stage2/src}/06_predictions-par.r | 0 {codes_Jairo_stage2 => code/stage2/src}/06_predictions.r | 0 {codes_Jairo_stage2 => code/stage2/src}/analysis-SME.r | 0 {codes_Jairo_stage2 => code/stage2/src}/aux.r | 0 {codes_Jairo_stage2 => code/stage2/src}/aux2.r | 0 {codes_Jairo_stage2 => code/stage2/src}/calendar_ir.txt | 0 .../stage2/src}/calendar_transition_groups-1996-2011.txt | 0 {codes_Jairo_stage2 => code/stage2/src}/datesall.txt | 0 {codes_Jairo_stage2 => code/stage2/src}/descriptive-32K.r | 0 .../stage2/src}/effectives-per-classe.r | 0 {codes_Jairo_stage2 => code/stage2/src}/identifs.txt | 0 .../stage2/src}/sowas-superseded.r | 0 codes_Jairo_stage2/old/export2csv.sh | 8 -------- 38 files changed, 8 deletions(-) rename {codes_Jairo_stage2 => code/stage2/src}/00_convertir-donnnes_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/00_convertir-donnnes_2010.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/00_convertir-donnnes_2011.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/00_createCalendar.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/00_plots-energycon.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/01_StBr.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/01_extract-features2_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/01_extract-features_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/01_extract-features_2010.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/02_cluster-par_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/02_cluster_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classes-par_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classesRANDOM-par_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classesRANDOM_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classesRANDOM_2010.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classes_2009.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classes_2010-par.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/03_compute-sums-of-classes_2010.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/04_predictions.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/05_cluster2step.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/05_cluster2stepWER-RANDOM.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/05_cluster2stepWER-par.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/05_cluster2stepWER.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/06_predictions-ICAME.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/06_predictions-RANDOM.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/06_predictions-par.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/06_predictions.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/analysis-SME.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/aux.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/aux2.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/calendar_ir.txt (100%) rename {codes_Jairo_stage2 => code/stage2/src}/calendar_transition_groups-1996-2011.txt (100%) rename {codes_Jairo_stage2 => code/stage2/src}/datesall.txt (100%) rename {codes_Jairo_stage2 => code/stage2/src}/descriptive-32K.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/effectives-per-classe.r (100%) rename {codes_Jairo_stage2 => code/stage2/src}/identifs.txt (100%) rename {codes_Jairo_stage2 => code/stage2/src}/sowas-superseded.r (100%) delete mode 100644 codes_Jairo_stage2/old/export2csv.sh diff --git a/codes_Jairo_stage2/00_convertir-donnnes_2009.r b/code/stage2/src/00_convertir-donnnes_2009.r similarity index 100% rename from codes_Jairo_stage2/00_convertir-donnnes_2009.r rename to code/stage2/src/00_convertir-donnnes_2009.r diff --git a/codes_Jairo_stage2/00_convertir-donnnes_2010.r b/code/stage2/src/00_convertir-donnnes_2010.r similarity index 100% rename from codes_Jairo_stage2/00_convertir-donnnes_2010.r rename to code/stage2/src/00_convertir-donnnes_2010.r diff --git a/codes_Jairo_stage2/00_convertir-donnnes_2011.r b/code/stage2/src/00_convertir-donnnes_2011.r similarity index 100% rename from codes_Jairo_stage2/00_convertir-donnnes_2011.r rename to code/stage2/src/00_convertir-donnnes_2011.r diff --git a/codes_Jairo_stage2/00_createCalendar.r b/code/stage2/src/00_createCalendar.r similarity index 100% rename from codes_Jairo_stage2/00_createCalendar.r rename to code/stage2/src/00_createCalendar.r diff --git a/codes_Jairo_stage2/00_plots-energycon.r b/code/stage2/src/00_plots-energycon.r similarity index 100% rename from codes_Jairo_stage2/00_plots-energycon.r rename to code/stage2/src/00_plots-energycon.r diff --git a/codes_Jairo_stage2/01_StBr.r b/code/stage2/src/01_StBr.r similarity index 100% rename from codes_Jairo_stage2/01_StBr.r rename to code/stage2/src/01_StBr.r diff --git a/codes_Jairo_stage2/01_extract-features2_2009.r b/code/stage2/src/01_extract-features2_2009.r similarity index 100% rename from codes_Jairo_stage2/01_extract-features2_2009.r rename to code/stage2/src/01_extract-features2_2009.r diff --git a/codes_Jairo_stage2/01_extract-features_2009.r b/code/stage2/src/01_extract-features_2009.r similarity index 100% rename from codes_Jairo_stage2/01_extract-features_2009.r rename to code/stage2/src/01_extract-features_2009.r diff --git a/codes_Jairo_stage2/01_extract-features_2010.r b/code/stage2/src/01_extract-features_2010.r similarity index 100% rename from codes_Jairo_stage2/01_extract-features_2010.r rename to code/stage2/src/01_extract-features_2010.r diff --git a/codes_Jairo_stage2/02_cluster-par_2009.r b/code/stage2/src/02_cluster-par_2009.r similarity index 100% rename from codes_Jairo_stage2/02_cluster-par_2009.r rename to code/stage2/src/02_cluster-par_2009.r diff --git a/codes_Jairo_stage2/02_cluster_2009.r b/code/stage2/src/02_cluster_2009.r similarity index 100% rename from codes_Jairo_stage2/02_cluster_2009.r rename to code/stage2/src/02_cluster_2009.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classes-par_2009.r b/code/stage2/src/03_compute-sums-of-classes-par_2009.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classes-par_2009.r rename to code/stage2/src/03_compute-sums-of-classes-par_2009.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classesRANDOM-par_2009.r b/code/stage2/src/03_compute-sums-of-classesRANDOM-par_2009.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classesRANDOM-par_2009.r rename to code/stage2/src/03_compute-sums-of-classesRANDOM-par_2009.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classesRANDOM_2009.r b/code/stage2/src/03_compute-sums-of-classesRANDOM_2009.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classesRANDOM_2009.r rename to code/stage2/src/03_compute-sums-of-classesRANDOM_2009.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classesRANDOM_2010.r b/code/stage2/src/03_compute-sums-of-classesRANDOM_2010.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classesRANDOM_2010.r rename to code/stage2/src/03_compute-sums-of-classesRANDOM_2010.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classes_2009.r b/code/stage2/src/03_compute-sums-of-classes_2009.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classes_2009.r rename to code/stage2/src/03_compute-sums-of-classes_2009.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classes_2010-par.r b/code/stage2/src/03_compute-sums-of-classes_2010-par.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classes_2010-par.r rename to code/stage2/src/03_compute-sums-of-classes_2010-par.r diff --git a/codes_Jairo_stage2/03_compute-sums-of-classes_2010.r b/code/stage2/src/03_compute-sums-of-classes_2010.r similarity index 100% rename from codes_Jairo_stage2/03_compute-sums-of-classes_2010.r rename to code/stage2/src/03_compute-sums-of-classes_2010.r diff --git a/codes_Jairo_stage2/04_predictions.r b/code/stage2/src/04_predictions.r similarity index 100% rename from codes_Jairo_stage2/04_predictions.r rename to code/stage2/src/04_predictions.r diff --git a/codes_Jairo_stage2/05_cluster2step.r b/code/stage2/src/05_cluster2step.r similarity index 100% rename from codes_Jairo_stage2/05_cluster2step.r rename to code/stage2/src/05_cluster2step.r diff --git a/codes_Jairo_stage2/05_cluster2stepWER-RANDOM.r b/code/stage2/src/05_cluster2stepWER-RANDOM.r similarity index 100% rename from codes_Jairo_stage2/05_cluster2stepWER-RANDOM.r rename to code/stage2/src/05_cluster2stepWER-RANDOM.r diff --git a/codes_Jairo_stage2/05_cluster2stepWER-par.r b/code/stage2/src/05_cluster2stepWER-par.r similarity index 100% rename from codes_Jairo_stage2/05_cluster2stepWER-par.r rename to code/stage2/src/05_cluster2stepWER-par.r diff --git a/codes_Jairo_stage2/05_cluster2stepWER.r b/code/stage2/src/05_cluster2stepWER.r similarity index 100% rename from codes_Jairo_stage2/05_cluster2stepWER.r rename to code/stage2/src/05_cluster2stepWER.r diff --git a/codes_Jairo_stage2/06_predictions-ICAME.r b/code/stage2/src/06_predictions-ICAME.r similarity index 100% rename from codes_Jairo_stage2/06_predictions-ICAME.r rename to code/stage2/src/06_predictions-ICAME.r diff --git a/codes_Jairo_stage2/06_predictions-RANDOM.r b/code/stage2/src/06_predictions-RANDOM.r similarity index 100% rename from codes_Jairo_stage2/06_predictions-RANDOM.r rename to code/stage2/src/06_predictions-RANDOM.r diff --git a/codes_Jairo_stage2/06_predictions-par.r b/code/stage2/src/06_predictions-par.r similarity index 100% rename from codes_Jairo_stage2/06_predictions-par.r rename to code/stage2/src/06_predictions-par.r diff --git a/codes_Jairo_stage2/06_predictions.r b/code/stage2/src/06_predictions.r similarity index 100% rename from codes_Jairo_stage2/06_predictions.r rename to code/stage2/src/06_predictions.r diff --git a/codes_Jairo_stage2/analysis-SME.r b/code/stage2/src/analysis-SME.r similarity index 100% rename from codes_Jairo_stage2/analysis-SME.r rename to code/stage2/src/analysis-SME.r diff --git a/codes_Jairo_stage2/aux.r b/code/stage2/src/aux.r similarity index 100% rename from codes_Jairo_stage2/aux.r rename to code/stage2/src/aux.r diff --git a/codes_Jairo_stage2/aux2.r b/code/stage2/src/aux2.r similarity index 100% rename from codes_Jairo_stage2/aux2.r rename to code/stage2/src/aux2.r diff --git a/codes_Jairo_stage2/calendar_ir.txt b/code/stage2/src/calendar_ir.txt similarity index 100% rename from codes_Jairo_stage2/calendar_ir.txt rename to code/stage2/src/calendar_ir.txt diff --git a/codes_Jairo_stage2/calendar_transition_groups-1996-2011.txt b/code/stage2/src/calendar_transition_groups-1996-2011.txt similarity index 100% rename from codes_Jairo_stage2/calendar_transition_groups-1996-2011.txt rename to code/stage2/src/calendar_transition_groups-1996-2011.txt diff --git a/codes_Jairo_stage2/datesall.txt b/code/stage2/src/datesall.txt similarity index 100% rename from codes_Jairo_stage2/datesall.txt rename to code/stage2/src/datesall.txt diff --git a/codes_Jairo_stage2/descriptive-32K.r b/code/stage2/src/descriptive-32K.r similarity index 100% rename from codes_Jairo_stage2/descriptive-32K.r rename to code/stage2/src/descriptive-32K.r diff --git a/codes_Jairo_stage2/effectives-per-classe.r b/code/stage2/src/effectives-per-classe.r similarity index 100% rename from codes_Jairo_stage2/effectives-per-classe.r rename to code/stage2/src/effectives-per-classe.r diff --git a/codes_Jairo_stage2/identifs.txt b/code/stage2/src/identifs.txt similarity index 100% rename from codes_Jairo_stage2/identifs.txt rename to code/stage2/src/identifs.txt diff --git a/codes_Jairo_stage2/sowas-superseded.r b/code/stage2/src/sowas-superseded.r similarity index 100% rename from codes_Jairo_stage2/sowas-superseded.r rename to code/stage2/src/sowas-superseded.r diff --git a/codes_Jairo_stage2/old/export2csv.sh b/codes_Jairo_stage2/old/export2csv.sh deleted file mode 100644 index 39ef399..0000000 --- a/codes_Jairo_stage2/old/export2csv.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -sqlite3 indiv32000.db <