written section 3.5.1 - todo: 3.5.2

5 files changed, 129 insertions, 50 deletions

diff --git a/appunti/modern canada fill up.md b/appunti/modern canada fill up.md
new file mode 100644
index 0000000..1506fe5
--- /dev/null
+++ b/appunti/modern canada fill up.md
@@ -0,0 +1,23 @@
+Today Canada has become a powerful country with a stable social and economic 

+system. Post war they enjoyed prosperity and material progress, the world trading

+restrictive policies were gone and they found oil in Alberta in 1947, which 

+started Canada's modern energy industry. In the following years the life quality

+of Canadians was raising, they drew closer to the USA and other trading partners

+enjoying the benefits of trading with one of strongest economies among 

+industrialized nations post war. Today those benefits gave to the Canadians one 

+of the highest standards of living. When Canada's prosperity grew the ability to

+support the citizien grew as well. Such as employement insurance, old age security

+and pension plans, or even public fundings for education. 

+[THEN HERE GOES THE REST OF THE TEXT ALREADY MADE FOR "MODERN CANADA"]

+

+

+

+

+

+

+

+

+

+

+

+

diff --git a/doc/build/pdi.pdf b/doc/build/pdi.pdf
index 3e390ce..a7ed722 100644
--- a/doc/build/pdi.pdf
+++ b/doc/build/pdi.pdf
diff --git a/doc/pdi.tex b/doc/pdi.tex
index 09628b5..5ffeb71 100644
--- a/doc/pdi.tex
+++ b/doc/pdi.tex
@@ -19,7 +19,7 @@
 \usepackage[T1]{fontenc}
 
 % page layout
-\usepackage[inner=2cm,outer=1.5cm,top=3cm,bottom=3cm]{geometry}
+\usepackage[inner=2cm,outer=1.5cm,top=3cm,bottom=3cm,marginpar=5mm]{geometry}
 \usepackage{fancyhdr}
 \usepackage{lastpage} % used for header
 \usepackage{afterpage}
@@ -51,6 +51,7 @@
 % other
 \usepackage{draftwatermark}
 % \usepackage{blindtext}
+%\usepackage{showframe}
 
 %% }}}
 
diff --git a/doc/tex/consumo.tex b/doc/tex/consumo.tex
index 09c5b9c..3241997 100644
--- a/doc/tex/consumo.tex
+++ b/doc/tex/consumo.tex
@@ -278,14 +278,34 @@ rispettivamente 2.621 TJ e 262.1 PJ.
 \]
 
 \section{Considerazione e comparazione dei dati}
-\begin{wrapfigure}{l}{.5\textwidth}
+In conclusione possiamo comparare i dati ottenuti, \`e importante notare per\`o
+che i dati sono da due anni differenti\footnote{Non \`e stato possibile trovare
+una combinazione di consumo e produzione dello stesso anno per il 2012 o per il
+2015.} quindi si deve considerare un margine di errore. Come \`e evidentemente
+notabile il consumo energetico Canadese \`e decisamente superiore alla
+produzione fornita dalle fonti rinnovabili, di conseguenza tutta la differenza
+deve originare da combustibili fossili come gas naturale o petrolio.
+
+\subsection{Stima della produzione del 2012}
+La comparazione di dati di anni differenti presenta un imprecisione difficile da
+trascurare ma fortunatamente dal documento di riferimento per il consumo
+\cite{nrcan:energyfactsbook} possiamo estrarre il consumo elettrico del 2012.
+Considerando che la produzione energetica del 2012 era pari al consumo possiamo
+possiamo avere una stima migliore. Utilizzando la seguente formula, dove $E$
+indica l'energia totale, $W$ l'energia elettrica e $J$ l'energia immagazzinata
+in materiale combustibile, possiamo ottenere una figura rappresentativa dello
+stato delle sorgenti rinnovabili (tutte le energie sono per persona al giorno).
+$$ E_{2012} - W_{2012} = J_{2012} $$
+$$ 190.20 - 38.8 = 151.4~\frac{kWh}{gg\cdot p} $$
+
+\begin{figure}[H]
     \centering
     \begin{tikzpicture}%
         \begin{axis}[
                 % plot type
                 ybar stacked,
                 % size
-                x = 2cm,
+                x = 2.2cm,
                 height=12cm,
                 bar width = 1.2cm,
                 bar shift = 0pt,
@@ -302,8 +322,8 @@ rispettivamente 2.621 TJ e 262.1 PJ.
                     },
                     check for zero
                 },
-                enlarge x limits = .5,
-                enlarge y limits = .1,
+                enlarge x limits = .3,
+                enlarge y limits = .2,
                 % axis
                 scale only axis,
                 axis x line* = bottom,
@@ -311,26 +331,37 @@ rispettivamente 2.621 TJ e 262.1 PJ.
                 ylabel={Energia $\frac{kWh}{gg\cdot p} $},
                 % y label style={at={(-.5,1.15)}},
                 % X values
-                xtick = {Consumo 2012, Produzione 2015},
+                xtick = {Consumo Totale 2012, Consumo Non Elettrico 2012, Consumo Elettrico 2012, Produzione Elettrica 2015},
                 xticklabel style={text width = 2cm, align = center, font={\footnotesize}},
-                symbolic x coords = {Consumo 2012, Produzione 2015},
+                symbolic x coords = {Consumo Totale 2012, Consumo Non Elettrico 2012, Consumo Elettrico 2012, Produzione Elettrica 2015},
                 % Y values
                 ymin = 0
             ]
 
             % consumption
-            
             \addplot+[ybar,blue,fill=blue!25] plot coordinates {
-                (Consumo 2012,32.3)
+                (Consumo Totale 2012,32.3)
             };
             \addplot+[ybar,NavyBlue,fill=NavyBlue!25] plot coordinates {
-                (Consumo 2012,22.8)
+                (Consumo Totale 2012,22.8)
             };
             \addplot+[ybar,Cerulean,fill=Cerulean!25] plot coordinates {
-                (Consumo 2012,72.3)
+                (Consumo Totale 2012,72.3)
             };
             \addplot+[ybar,SkyBlue,fill=SkyBlue!25] plot coordinates {
-                (Consumo 2012,62.8)
+                (Consumo Totale 2012,62.8)
+            };
+
+            % forget stacked count
+            \makeatletter
+            \pgfplots@stacked@isfirstplottrue
+            \makeatother
+            \addplot [forget plot,draw=none] coordinates {
+                (Consumo Totale 2012,0) (Consumo Elettrico 2012,0) (Produzione Elettrica 2015,0) 
+            };
+
+            \addplot+[ybar,LimeGreen,fill=LimeGreen!25] plot coordinates {
+                (Consumo Non Elettrico 2012,151.4)
             };
 
             % forget stacked count
@@ -338,32 +369,49 @@ rispettivamente 2.621 TJ e 262.1 PJ.
             \pgfplots@stacked@isfirstplottrue
             \makeatother
             \addplot [forget plot,draw=none] coordinates {
-                (Consumo 2012,0) (Produzione 2015,0) 
+                (Consumo Totale 2012,0) (Consumo Elettrico 2012,0) (Produzione Elettrica 2015,0) 
+            };
+
+            \addplot+[ybar,Green,fill=Green!25] plot coordinates {
+                (Consumo Elettrico 2012,38.8)
+            };
+
+            % forget stacked count
+            \makeatletter
+            \pgfplots@stacked@isfirstplottrue
+            \makeatother
+            \addplot [forget plot,draw=none] coordinates {
+                (Consumo Totale 2012,0) (Consumo Elettrico 2012,0) (Produzione Elettrica 2015,0) 
             };
         
             % production
-
             \addplot+[ybar,Fuchsia,fill=Fuchsia!25] plot coordinates {
-                (Produzione 2015,0.00098)
+                (Produzione Elettrica 2015,0.00098)
             };
             \addplot+[ybar,Plum,fill=Plum!25] plot coordinates {
-                (Produzione 2015,0.026)
+                (Produzione Elettrica 2015,0.026)
             };
             \addplot+[ybar,RedViolet,fill=RedViolet!25] plot coordinates {
-                (Produzione 2015,0.013)
+                (Produzione Elettrica 2015,0.013)
             };
             \addplot+[ybar,BrickRed,fill=BrickRed!25] plot coordinates {
-                (Produzione 2015,1.3)
+                (Produzione Elettrica 2015,1.3)
             };
             \addplot+[ybar,RedOrange,fill=RedOrange!25] plot coordinates {
-                (Produzione 2015,28.5)
+                (Produzione Elettrica 2015,28.5)
             };
             \addplot+[ybar,YellowOrange,fill=YellowOrange!25] plot coordinates {
-                (Produzione 2015,10.7)
+                (Produzione Elettrica 2015,10.7)
             };
             \addplot+[ybar,Dandelion,fill=Dandelion!25] plot coordinates {
-                (Produzione 2015,7.3)
+                (Produzione Elettrica 2015,7.3)
             };
         \end{axis}%
     \end{tikzpicture}%
-\end{wrapfigure}
+    \caption{Comparazione dei dati di consumo e produzione.}
+\end{figure}
+
+% Con gli stessi dati possiamo anche calcolare la differenza di consumo elettrico
+% tra i due anni e il tasso di incremento che indicheremo con la lettera $\lambda$.
+% $$ \lambda = \frac{W_{2015}}{W_{2012}} $$
+% $$ \Delta W = W_{2015} - W_{2012} $$
diff --git a/doc/tex/introduzione.tex b/doc/tex/introduzione.tex
index bed3c5f..27db09e 100644
--- a/doc/tex/introduzione.tex
+++ b/doc/tex/introduzione.tex
@@ -47,6 +47,7 @@ populated by various groups of indigenous peoples which today are referred as
 First Nations (Premières Nations in French) or sometime incorrectly a
 `Indians'. There were 6 major tribes and each one of them lived in a particular
 area of the continent.
+
 \begin{wrapfigure}{r}{.4\textwidth}
     \centering
     \includegraphics[height=6cm]{res/photos/first_nations.jpg}
@@ -54,18 +55,18 @@ area of the continent.
     Lakes}
 \end{wrapfigure}
 
-Each tribe had developed a particular culture based on the environment where 
+Each tribe had developed a particular culture based on the environment where
 they lived. For example on the west coast the Pacific Coast First Nation gave
 thank to the sea because they lived mostly off fishing, whereas the Iroquian
 First Nation, on the south, organized many ceremonies during spring as they
 gathered most of their food from agriculture.  But there were some things that
-all populations had in common: a deep cult of
-respect for resources offered by nature; everything from hunting to farming had
-a ritual to honor the harmony between them, the world and the Creator.  Another
-cultural aspect that common all First Nations was a complex social
-organization system built around hunting developed over thousands of years.
-Every tribe lived and hunted in a well defined territory in order not to 
-interfere with other clans and communal hunts took place every summer. 
+all populations had in common: a deep cult of respect for resources offered by
+nature; everything from hunting to farming had a ritual to honor the harmony
+between them, the world and the Creator.  Another cultural aspect that common
+all First Nations was a complex social organization system built around hunting
+developed over thousands of years.  Every tribe lived and hunted in a well
+defined territory in order not to interfere with other clans and communal hunts
+took place every summer. 
 
 \subsection{Colonization}
 The colonization of the `new world' began shortly after its discovery,
@@ -83,18 +84,16 @@ continent, but the harsh environment prevented any expansion.
     \caption{Map of European settlements in 1702. Territories under the French 
     dominion are in blue while territories under the British Empire are in red.}
 \end{wrapfigure} \nocite{canadasettlements}
-
-As a result, they
-started to trade with locals, so many goods were traded with the First Nations in 
-exchange of fur and food to protect the settlers from the cold winters. 
-Later on the trade grew on a bigger scale and many resources were exported to
-France, which helped the development of the existing and new settlements.
-At the same time British colonies were also built. Because of the strong power
-of the British Colonial Empire British settlements grew faster than the other
-French colonies which caused a shift in power. As the 18th century began
-Great Britain was the leading power in the trading market. As a consequence of
-this in many treaties that came next France lost most of its territories while
-the British expanded theirs.
+As a result, they started to trade with locals, so many goods were traded with
+the First Nations in exchange of fur and food to protect the settlers from the
+cold winters.  Later on the trade grew on a bigger scale and many resources were
+exported to France, which helped the development of the existing and new
+settlements.  At the same time British colonies were also built. Because of the
+strong power of the British Colonial Empire British settlements grew faster than
+the other French colonies which caused a shift in power. As the 18th century
+began Great Britain was the leading power in the trading market. As a
+consequence of this in many treaties that came next France lost most of its
+territories while the British expanded theirs.
 
 \subsection{Industrialization}
 In 1867 with the establishment of the North American Act the first Canadian
@@ -113,15 +112,23 @@ the United States contributed a lot to the development of a modernised Canada.
 \subsection{Modern Canada}
 
 Today Canada has become a powerful country with a stable social and economic
-system and it is a great contributor to various international projects.  The
-Canadian society today is known to be open and flexible to other cultures,
-that's why the Canadian population is composed of many ethnic groups.  In Canada
-the official languages are English and French since the original colonial powers
-that brought them there, were France and the United Kingdom.  As official
-currency Canada uses the Canadian Dollar (CAD), since 2016 one Canadian Dollar
-equals
+system and it is a great contributor to various international projects.  Post
+war they enjoyed prosperity and material progress, the world trading restrictive
+policies were gone and they found oil in Alberta in 1947, which started Canada's
+modern energy industry. In the following years the life quality of Canadians was
+raising, they drew closer to the USA and other trading partners enjoying the
+benefits of trading with one of strongest economies among industrialized nations
+post war. Today those benefits gave to the Canadians one of the highest
+standards of living. When Canada's prosperity grew the ability to support the
+citizien grew as well. Such as employement insurance, old age security and
+pension plans, or even public fundings for education.  The Canadian society
+today is known to be open and flexible to other cultures, that's why the
+Canadian population is composed of many ethnic groups.  In Canada the official
+languages are English and French since the original colonial powers that brought
+them there, were France and the United Kingdom.  As official currency Canada
+uses the Canadian Dollar (CAD), since 2016 one Canadian Dollar equals
 \href{http://www.xe.com/currencyconverter/convert/?Amount=1&From=CAD&To=CHF}{
-0.76 Swiss Francs}. Canada's GDP (as Q2 2015) is more than twice the swiss
+    0.76 Swiss Francs}. Canada's GDP (as Q2 2015) is more than twice the swiss
 one \cite{swisseconomy} with a market price of 1'996'804 millions of Canadian
 dollars \cite{statscan:ecoimpexps} which roughly equals to 1.54 millions of
 million of Swiss francs.