summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/make.bat (renamed from docs/make.bat)0
-rw-r--r--doc/makefile (renamed from docs/makefile)3
-rw-r--r--doc/pdi.bib (renamed from docs/pdi.bib)2
-rw-r--r--doc/pdi.tex (renamed from docs/pdi.tex)9
-rw-r--r--doc/res/data/heat_of_combustion.csv12
-rw-r--r--doc/res/images/cam_cpt_logo.pdfbin0 -> 8546 bytes
-rw-r--r--doc/res/images/cam_cpt_logo.svg (renamed from docs/res/images/cam_cpt_logo.svg)0
-rw-r--r--doc/res/images/canada_settlements.pdf (renamed from docs/res/images/canada_settlements_orig.pdf)bin131202 -> 126072 bytes
-rw-r--r--doc/res/images/canada_settlements.png (renamed from docs/res/images/canada_settlements.png)bin166902 -> 166902 bytes
-rw-r--r--doc/res/images/canada_settlements.svg (renamed from docs/res/images/canada_settlements.svg)0
-rw-r--r--doc/res/images/canada_settlements_orig.pdf (renamed from docs/res/images/canada_settlements.pdf)bin136741 -> 125924 bytes
-rw-r--r--doc/res/images/canada_settlements_orig.svg (renamed from docs/res/images/canada_settlements_orig.svg)0
-rw-r--r--doc/res/images/canadian_red_ensign.pdf (renamed from docs/res/images/canadian_red_ensign.pdf)bin36599 -> 36599 bytes
-rw-r--r--doc/res/images/canadian_red_ensign.svg (renamed from docs/res/images/canadian_red_ensign.svg)0
-rw-r--r--doc/res/images/flag_of_canada.pdf (renamed from docs/res/images/flag_of_canada.pdf)bin1445 -> 1445 bytes
-rw-r--r--doc/res/images/flag_of_canada.svg (renamed from docs/res/images/flag_of_canada.svg)0
-rw-r--r--doc/res/photos/first_nations.jpg (renamed from docs/res/photos/first_nations.jpg)bin74708 -> 74708 bytes
-rw-r--r--doc/tex/conclusioni.tex (renamed from docs/tex/conclusioni.tex)0
-rw-r--r--doc/tex/consumo.tex (renamed from docs/tex/consumo.tex)0
-rw-r--r--doc/tex/introduzione.tex (renamed from docs/tex/introduzione.tex)0
-rw-r--r--doc/tex/politica.tex (renamed from docs/tex/politica.tex)19
-rw-r--r--doc/tex/produzione.tex (renamed from docs/tex/produzione.tex)0
-rw-r--r--docs/res/images/cam_cpt_logo.pdfbin8932 -> 0 bytes
23 files changed, 25 insertions, 20 deletions
diff --git a/docs/make.bat b/doc/make.bat
index 93cbbcc..93cbbcc 100644
--- a/docs/make.bat
+++ b/doc/make.bat
diff --git a/docs/makefile b/doc/makefile
index 8336791..6baefea 100644
--- a/docs/makefile
+++ b/doc/makefile
@@ -17,7 +17,8 @@ BIB := biber
.PHONY: all build clean
all: build
-build: $(PDFS)
+build: $(PDFS)
+ mkdir -p $(BUILD_DIR)
$(TEX) --output-directory=$(BUILD_DIR) $(DOCUMENT)
$(BIB) --output-directory=$(BUILD_DIR) $(BIBLIOGRAPHY)
$(TEX) --output-directory=$(BUILD_DIR) $(DOCUMENT)
diff --git a/docs/pdi.bib b/doc/pdi.bib
index 8ac8d64..8aa6475 100644
--- a/docs/pdi.bib
+++ b/doc/pdi.bib
@@ -100,7 +100,7 @@ $$ }}}
%% -----------------------------------------------------------------------------
%% IMMAGINI {{{
@online{canadasettlements,
- author = "Wikipedia User Magicpiano",
+ author = "Wikimedia User",
title = "QueenAnnesWarBefore.svg",
year = "2010",
keywords = "pic",
diff --git a/docs/pdi.tex b/doc/pdi.tex
index eeda071..9ce98ea 100644
--- a/docs/pdi.tex
+++ b/doc/pdi.tex
@@ -7,16 +7,18 @@
%% Alan Scheidegger 3B
%%
-\documentclass[draft,a4paper,twoside,12pt]{report}
+\documentclass[a4paper,twoside,12pt]{report}
%% Packages {{{
% file encoding and language
\usepackage[utf8]{inputenc}
\usepackage[english,italian]{babel}
+
% \usepackage{lmodern}
\usepackage[scaled]{helvet}
\renewcommand\familydefault{\sfdefault}
%\usepackage[helvet]{sfmath}
+
\usepackage[T1]{fontenc}
% page layout
@@ -30,6 +32,11 @@
\usepackage{caption}
\usepackage{subcaption}
\usepackage{float}
+\usepackage{csvsimple}
+
+% math
+\usepackage{amsmath}
+\usepackage{cancel}
% links
\usepackage{hyperref}
diff --git a/doc/res/data/heat_of_combustion.csv b/doc/res/data/heat_of_combustion.csv
new file mode 100644
index 0000000..309078d
--- /dev/null
+++ b/doc/res/data/heat_of_combustion.csv
@@ -0,0 +1,12 @@
+fuel,heat of combustion [MJ/kg]
+petroleum coke,34.2
+diesel,43.3
+heavy fuel oil,41
+methane,50
+bituminous coal,31.3
+subbituminous coal,31.3
+propane,27.2
+light fuel oil,43.6
+natural gas,47.7
+lignite,22
+wood,15
diff --git a/doc/res/images/cam_cpt_logo.pdf b/doc/res/images/cam_cpt_logo.pdf
new file mode 100644
index 0000000..91a12da
--- /dev/null
+++ b/doc/res/images/cam_cpt_logo.pdf
Binary files differ
diff --git a/docs/res/images/cam_cpt_logo.svg b/doc/res/images/cam_cpt_logo.svg
index c18ceec..c18ceec 100644
--- a/docs/res/images/cam_cpt_logo.svg
+++ b/doc/res/images/cam_cpt_logo.svg
diff --git a/docs/res/images/canada_settlements_orig.pdf b/doc/res/images/canada_settlements.pdf
index d9b2636..6fe09c5 100644
--- a/docs/res/images/canada_settlements_orig.pdf
+++ b/doc/res/images/canada_settlements.pdf
Binary files differ
diff --git a/docs/res/images/canada_settlements.png b/doc/res/images/canada_settlements.png
index 3e1e5e3..3e1e5e3 100644
--- a/docs/res/images/canada_settlements.png
+++ b/doc/res/images/canada_settlements.png
Binary files differ
diff --git a/docs/res/images/canada_settlements.svg b/doc/res/images/canada_settlements.svg
index 895d4bc..895d4bc 100644
--- a/docs/res/images/canada_settlements.svg
+++ b/doc/res/images/canada_settlements.svg
diff --git a/docs/res/images/canada_settlements.pdf b/doc/res/images/canada_settlements_orig.pdf
index 42c8c72..73aa1fb 100644
--- a/docs/res/images/canada_settlements.pdf
+++ b/doc/res/images/canada_settlements_orig.pdf
Binary files differ
diff --git a/docs/res/images/canada_settlements_orig.svg b/doc/res/images/canada_settlements_orig.svg
index b24c25f..b24c25f 100644
--- a/docs/res/images/canada_settlements_orig.svg
+++ b/doc/res/images/canada_settlements_orig.svg
diff --git a/docs/res/images/canadian_red_ensign.pdf b/doc/res/images/canadian_red_ensign.pdf
index 84c90db..84c90db 100644
--- a/docs/res/images/canadian_red_ensign.pdf
+++ b/doc/res/images/canadian_red_ensign.pdf
Binary files differ
diff --git a/docs/res/images/canadian_red_ensign.svg b/doc/res/images/canadian_red_ensign.svg
index 86de5c1..86de5c1 100644
--- a/docs/res/images/canadian_red_ensign.svg
+++ b/doc/res/images/canadian_red_ensign.svg
diff --git a/docs/res/images/flag_of_canada.pdf b/doc/res/images/flag_of_canada.pdf
index 9c1c1fe..9c1c1fe 100644
--- a/docs/res/images/flag_of_canada.pdf
+++ b/doc/res/images/flag_of_canada.pdf
Binary files differ
diff --git a/docs/res/images/flag_of_canada.svg b/doc/res/images/flag_of_canada.svg
index 8941f6c..8941f6c 100644
--- a/docs/res/images/flag_of_canada.svg
+++ b/doc/res/images/flag_of_canada.svg
diff --git a/docs/res/photos/first_nations.jpg b/doc/res/photos/first_nations.jpg
index b285eb2..b285eb2 100644
--- a/docs/res/photos/first_nations.jpg
+++ b/doc/res/photos/first_nations.jpg
Binary files differ
diff --git a/docs/tex/conclusioni.tex b/doc/tex/conclusioni.tex
index 9818f07..9818f07 100644
--- a/docs/tex/conclusioni.tex
+++ b/doc/tex/conclusioni.tex
diff --git a/docs/tex/consumo.tex b/doc/tex/consumo.tex
index d95d7b5..d95d7b5 100644
--- a/docs/tex/consumo.tex
+++ b/doc/tex/consumo.tex
diff --git a/docs/tex/introduzione.tex b/doc/tex/introduzione.tex
index 871dc1e..871dc1e 100644
--- a/docs/tex/introduzione.tex
+++ b/doc/tex/introduzione.tex
diff --git a/docs/tex/politica.tex b/doc/tex/politica.tex
index 2fb4573..30c2b77 100644
--- a/docs/tex/politica.tex
+++ b/doc/tex/politica.tex
@@ -85,7 +85,8 @@ seguente formula.
m_{CO_2} = m\cdot\Delta_c\cdot k_{CO_2}
\]
\[
-[kg] = [kg]\cdot \Bigg [\frac{kg}{MJ}\Bigg ] \cdot \Bigg [\frac{MJ}{kg}\Bigg ]
+ [kg] = [kg]\cdot \cancel{\Bigg [\frac{kg}{MJ}\Bigg ]}
+ \cdot \cancel{\Bigg [\frac{MJ}{kg}\Bigg ]}
\]
In questa tabella il coefficente di emissioni di CO\textsubscript{2} \`e gi\`a
stato convertito in kilogrammi su kilogrammi (moltiplicato per $\Delta_c$) e
@@ -120,19 +121,3 @@ comprendere meglio i pericoli reali dell'energia atomica \`e necessario
analizzare analiticamente la situazione attuale di questo mezzo di produzione.
Perci\`o sar\`a necessario quantificare in delle unit\`a comparabili i vantaggi
e gli svantaggi del nucleare.
-
-%% magari da ripensare
-\subsection{Morti}
-Analizziamo dunque la prima ragione per cui ci si allontana dal nucleare, il
-pericolo. La psicologia umana sembra sia fatta in maniera tale da dare pi\`u
-importanza ad eventi singoli e catastrofici rispetto a pericoli passivi su un
-grande arco di tempo. Consideriamo quindi come prima unit\`a di comparazione il
-{\it pericolo diretto} ovvero le morti per anno medie sul posto di lavoro.
-Per ogni sorgente energetica prendiamo il numero di morti registrare sul posto
-di lavoro diviso da quanti anni si lavora la risorsa.
-\[
- pericolo~diretto~=\frac{morti~registrati}{anno~attuale-inizio~lavorazione}
-\]
-Questa misura per\`o non prende in considerazione il danno passivo causato da
-emissioni dalla combustione o radiazioni, unit\`a che tendono ad essere
-difficili da registrare.
diff --git a/docs/tex/produzione.tex b/doc/tex/produzione.tex
index 15f3938..15f3938 100644
--- a/docs/tex/produzione.tex
+++ b/doc/tex/produzione.tex
diff --git a/docs/res/images/cam_cpt_logo.pdf b/docs/res/images/cam_cpt_logo.pdf
deleted file mode 100644
index 423c6dc..0000000
--- a/docs/res/images/cam_cpt_logo.pdf
+++ /dev/null
Binary files differ