merged alan's work (production)

2 files changed, 28 insertions, 290 deletions

diff --git a/docs/pdi.bib b/docs/pdi.bib
index b36135a..d725b49 100644
--- a/docs/pdi.bib
+++ b/docs/pdi.bib
@@ -77,6 +77,24 @@ $$ }}}
 }
 %% }}}
 
+%% - STATISTICS {{{------------------------------------------------------------
+
+% energy consumption of households in europe
+@online{eea:households,
+    author = "European Environment Agency",
+    title = "Household energy consumption by end-use in the EU-27",
+    keywords = "ref",
+    url = "http://www.eea.europa.eu/data-and-maps/figures/households-energy-consumption-by-end-uses-4"
+}
+
+@online{eea:energy,
+    author = "European Environment Agency",
+    title = "Energy efficiency and energy consumption in the household sector",
+    keywords = "ref",
+    url = "http://www.eea.europa.eu/data-and-maps/indicators/energy-efficiency-and-energy-consumption-5/assessment"
+}
+%% }}}
+
 %% }}}
 
 
@@ -213,7 +231,7 @@ $$ }}}
 @online{nrcan:energymeeting,
     author = "Natural Resources Canada",
     title = "Minister Carr Hosts North American Energy Ministers Meeting",
-    year = "12.2.2016",
+    date = "2016-12-02",
     keywords = "gov",
     url = "https://goo.gl/htBHw1"
 }
@@ -284,6 +302,15 @@ $$ }}}
     url = "http://www.cic.gc.ca/english/resources/publications/discover/section-06.asp"
 }
 
+@online{canencyl:tidal,
+    author = "R. H. Clark \and Sarah-Taissir Bencharif",
+    title = "Tidal Energy",
+    date = "2013-08-20",
+    keywords = "gov",
+    url = "http://www.thecanadianencyclopedia.ca/en/article/tidal-energy/"
+}
+
+
 %% }}}
 
 %% }}}
diff --git a/docs/pdi.bib~ b/docs/pdi.bib~
deleted file mode 100644
index b36135a..0000000
--- a/docs/pdi.bib~
+++ /dev/null
@@ -1,289 +0,0 @@
-%% -----------------------------------------------------------------------------
-%% DOCUMENTI {{{
-%% -----------------------------------------------------------------------------
-
-%% file: energia_sostenibile.pdf sustainable_energy.pdf
-@book{withouthotair,
-    author = "David JC MacKay",
-    title = "Sustinable Energy - Without hot air",
-    year = "2008",
-    publisher = "UIT",
-    keywords = "ref"
-}
-
-%% - HISTORY {{{ ---------------------------------------------------------------
-@online{energycrisis,
-    author = "Jimmy Carter",
-    title = "Energy Crisis (1970s)",
-    year = "2010",
-    publisher = "A+E Networks",
-    keywords = "ref",
-    url = "http://www.history.com/topics/energy-crisis"
-}
-
-@online{pieroconti,
-    author = "Wikipedia",
-    title = "Piero Ginori Conti",
-    keywords = "ref",
-    url = "https://en.wikipedia.org/wiki/Piero_Ginori_Conti"
-}
-$$ }}}
-
-%% - ECONOMICS RELATED DATA {{{ ------------------------------------------------
-@online{swisseconomy,
-    author = "Swiss Confederation",
-    title = "National Economy",
-    keywords = "ref",
-    url = "http://www.bfs.admin.ch/bfs/portal/en/index/themen/04/02/01.html"
-}
-
-%% }}}
-
-%% - SCIENCE AND NATURE {{{ ----------------------------------------------------
-@online{originofwind,
-    author = "National Weather Service",
-    title = "Origin of wind",
-    keywords = "ref",
-    url = "http://www.srh.noaa.gov/jetstream/synoptic/wind.html"
-}
-
-@online{naturalgas,
-    author = "{C}anadian {A}ssociation of {P}etroleum {P}roducers ({CAPP})",
-    title = "Natural Gas Development",
-    keywords = "ref",
-    url = "http://www.capp.ca/canadian-oil-and-natural-gas/natural-gas/natural-gas-development"
-}
-
-@online{co2:oil,
-    author = "Ann-Kristin Peterson \and Jürg Rohrer",
-    title = "What is a carbon footprint - definition",
-    keywords = "ref",
-    url = "http://timeforchange.org/what-is-a-carbon-footprint-definition"
-}
-
-@online{poterecalorico,
-    author = "Dr. Ing. Luca Galbiati",
-    title = "Potere calorifico dei combustibili",
-    keywords = "ref",
-    url = "http://www.manualihoepli.it/media/doc/pr243.pdf"
-    % url = "http://www.manualihoepli.it/index.php?sezione=autori&id=79"
-}
-
-@online{solarthermal,
-    author = "Aisha Abdelhamid",
-    title = "Solar Thermal Panels For Heating and Cooling",
-    keywords = "ref",
-    url = "https://cleantechnica.com/2015/05/04/solar-thermal-panels-heating-cooling/"
-}
-%% }}}
-
-%% }}}
-
-
-%% -----------------------------------------------------------------------------
-%% DOCUMENTI DA ENTITA` GOVERNATIVE {{{
-%% -----------------------------------------------------------------------------
-
-%% - STATISTICS CANADA CANSIM {{{ ----------------------------------------------
-@online{cansim:electricity,
-    author = "Statistics Canada CANSIM",
-    title = "Electric power generation, by class of electricity producer",
-    keywords = "gov",
-    url = "http://www5.statcan.gc.ca/cansim/a26?lang=eng&retrLang=eng&id=1270007&pattern=electric+power+generation&tabMode=dataTable&srchLan=-1&p1=1&p2=9"
-}
-
-@online{cansim:electricityfuel,
-    author = "Statistics Canada CANSIM",
-    title = "Fuel consumed for electric power generation, by electric utility thermal plants",
-    keywords = "gov",
-    url = "http://www5.statcan.gc.ca/cansim/a26?lang=eng&retrLang=eng&id=1270004&pattern=electric+power+fuel&tabMode=dataTable&srchLan=-1&p1=1&p2=9"
-}
-
-@online{cansim:householdsheating,
-    author = "Statistics Canda CANSIM",
-    title = "Households and the environment survey, primary heating system, Canada, provinces and census metropolitan areas (CMA)",
-    keywords = "gov",
-    url = "http://www5.statcan.gc.ca/cansim/a26?lang=eng&retrLang=eng&id=1530145&pattern=households+heating&tabMode=dataTable&srchLan=-1&p1=1&p2=9"
-}
-%% }}}
-
-%% - STATISTICS CANADA {{{ -----------------------------------------------------
-@online{statcan:demographics,
-	author = "Statistics Canada",
-    title = "Population by year, by province and territory",
-    keyword = "gov",
-    url = "http://www.statcan.gc.ca/tables-tableaux/sum-som/l01/cst01/demo02a-eng.htm"
-}
-
-@online{statcan:energy,
-    author = "Statistics Canada",
-    title = "Energy",
-    keywords = "gov",
-    url = "http://www.statcan.gc.ca/pub/11-402-x/2012000/chap/ener/ener-eng.htm"
-}
-
-%% file: phys01-eng.csv
-@online{statscan:statarea,
-    author = "Statistics Canada",
-    title = "Land and freshwater area, by province and territory",
-    year = "2005",
-    keywords = "gov",
-    url = "http://www.statcan.gc.ca/tables-tableaux/sum-som/l01/cst01/phys01-eng.htm"
-}
-
-%% file: 
-@online{statscan:ecoimpexps,
-    author = "Statistics Canada",
-    title = "Imports, exports and trade balance of goods on a balance-of-payments basis, by country or country grouping",
-    year = "2005",
-    keywords = "gov",
-    url = "http://www.statcan.gc.ca/tables-tableaux/sum-som/l01/cst01/gblec02a-eng.htm"
-}
-
-% file: GHGEmissions_EN.pdf
-@misc{statscan:ghgemissions,
-    author = "Statistics Canada",
-    title = "Greenhouse Gas Emissions",
-    year = "2016",
-    keywords = "gov",
-    url = "https://www.ec.gc.ca/indicateurs-indicators/default.asp?lang=en&n=FBF8455E-1"
-}
-
-% file : 11-526-s2010001-eng.pdf
-@techreport{statscan:householdsconsumption,
-    author = "Statistics Canada",
-    title = "Households and the Environment: Energy Use",
-    year = "2007",
-    keywords = "gov",
-    url = "http://www.statcan.gc.ca/pub/11-526-s/11-526-s2010001-eng.pdf"
-}
-%% }}} 
-
-%% - ENVIRNONMENT CANADA {{{ ---------------------------------------------------
-%% file: ID_3050_Overview of 2014 NPRI data_EN_Nov-9-15_3.pdf
-@techreport{envcan:npridata,
-    author = "{N}ational {P}ollutant {R}elease {I}nventory ({NPRI})",
-    title = "Overview of Reviewed Facility - Reported Data",
-    institution = "Environment Canada",
-    year = "2014",
-    keywords = "gov",
-    url = "https://www.ec.gc.ca/inrp-npri/B85A1846-04AB-4E40-ACA0-E7DA313CA7AD/ID_3050_Overview%20of%202014%20NPRI%20data_EN_Nov-9-15_3.pdf"
-}
-
-%% file: Envirostat_16-002-x2008004-eng.pdf
-@techreport{envcan:envirostats,
-    author = "Gabriel Clark-Milito, Alison Gagnon",
-    title = "Greenhouse gas emissions: a focus on Canadian households",
-    institution = "Environment Canada",
-    year = "2008",
-    keywords = "gov",
-    url = "http://www.statcan.gc.ca/pub/16-002-x/16-002-x2008004-eng.pdf"
-}
-%% }}}
-
-%% - NATURAL RESOURCES CANADA {{{ ----------------------------------------------
-%% file: EnergyFactBook2015-Eng_Web.pdf
-@book{nrcan:energyfactsbook,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "Energy Fact Book",
-    year = "2015",
-    publisher = "{N}atural {R}esources {Can}ada ({NRCan})",
-    keywords = "gov",
-    url = "https://www.nrcan.gc.ca/sites/www.nrcan.gc.ca/files/energy/files/pdf/EnergyFactBook2015-Eng_Web.pdf"
-}
-
-@online{nrcan:electricity,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "About Electricity",
-    year = "2016",
-    publisher = "{N}atural {R}esources {Can}ada ({NRCan})",
-    keywords = "gov",
-    url = "http://www.nrcan.gc.ca/energy/electricity-infrastructure/about-electricity/735"
-}
-
-@online{nrcan:renewables,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "About Renewable Energy",
-    year = "2016",
-    publisher = "{N}atural {R}esources {Can}ada ({NRCan})",
-    keywords = "gov",
-    url = "https://www.nrcan.gc.ca/energy/renewable-electricity/7295"
-}
-
-@online{nrcan:energymeeting,
-    author = "Natural Resources Canada",
-    title = "Minister Carr Hosts North American Energy Ministers Meeting",
-    year = "12.2.2016",
-    keywords = "gov",
-    url = "https://goo.gl/htBHw1"
-}
-
-@online{nrcan:nacei,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "North American Cooperation on Energy Information (NACEI)",
-    year = "2016",
-    keywords = "gov",
-    url = "https://www.nrcan.gc.ca/energy/international/nacei/18051"
-}
-
-%% file: renewable_energy_e.pdf
-@proceedings{nrcan:wind,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "Canada – A Global Leader in Renewable Energy, Enhancing Collaboration on Renewable Energy Technologies",
-    year = "2013",
-    publisher = "{N}atural {R}esources {Can}ada ({NRCan})",
-    keywords = "gov",
-    url = "https://www.nrcan.gc.ca/sites/www.nrcan.gc.ca/files/www/pdf/publications/emmc/renewable_energy_e.pdf"
-}
-
-%% file: trends.pdf
-@proceedings{nrcan:energytrends,
-    author = "{N}atural {R}esources {Can}ada ({NRCan})",
-    title = "Energy Efficiency Trends in Canada",
-    year = "2011",
-    publisher = "{N}atural {R}esources {Can}ada ({NRCan})",
-    url = "http://oee.nrcan.gc.ca/publications/statistics/trends11/pdf/trends.pdf"
-}
-%% }}}
-
-%% - NATIONAL ENERGY BOARD {{{ -------------------------------------------------
-%% file: 2014nrgdnmc-eng.pdf
-@techreport{nebcan:energyboard,
-    author = "{N}ational {E}nergy {B}oard Canada",
-    title = "Canadian Energy Dynamics: Review of 2014",
-    year = "2014",
-    publisher = "{N}ational {E}nergy {B}oard Canada",
-    keywords = "gov",
-    url = "https://www.neb-one.gc.ca/nrg/ntgrtd/mrkt/dnmc/2014/2014nrgdnmc-eng.pdf"
-}
-%% }}}
-
-%% - OTHER {{{ -----------------------------------------------------------------
-% file: M183-2-6914-eng.pdf1
-@techreport{gerpc:getermalpot,
-    author = "S.E. Grasby and D.M. Allen and S. Bell and Z. Chen and G. Ferguson and A. Jessop and M. Kelman and M. Ko and J. Majorowicz and M. Moore and J. Raymond and R. Therrien",
-    title = "Geothermal Energy Resource Potential of Canada",
-    year = "2012",
-    keywords = "gov",
-    url = "http://publications.gc.ca/collections/collection_2013/rncan-nrcan/M183-2-6914-eng.pdf"
-}
-
-@online{cangea:history,
-    author = "{Can}adian {G}eothermal {E}nergy {A}ssociation ({CanGEA})",
-    title = "History of geothermal in Canada",
-    keywords = "gov",
-    url = "http://www.cangea.ca/history-of-geothermal-in-canada.html"
-}
-
-% history
-@online{history,
-    author = "Government of Canada",
-    title = "Canada's History",
-    year = "2012",
-    keywords = "gov",
-    url = "http://www.cic.gc.ca/english/resources/publications/discover/section-06.asp"
-}
-
-%% }}}
-
-%% }}}