From 109b9ca4a6878b9ed265ab6eec413883415d9e8d Mon Sep 17 00:00:00 2001
From: www-data <www-data@lahar.helm.cs.unibo.it>
Date: Thu, 11 Dec 2014 13:59:39 +0100
Subject: [PATCH] New exercises.

---
 public_html/esercizi/demorgan.xml  |  4 +--
 public_html/esercizi/demorgan2.xml |  4 +--
 public_html/esercizi/demorgan3.xml | 27 +++++++++++++++++++
 public_html/esercizi/demorgan4.xml | 27 +++++++++++++++++++
 public_html/esercizi/em.xml        | 17 ++++++++++++
 public_html/esercizi/ex1-1.xml     | 21 +++++++++++++++
 public_html/esercizi/ex1-2.xml     | 21 +++++++++++++++
 public_html/esercizi/ex1-3.xml     | 27 +++++++++++++++++++
 public_html/esercizi/ex1-4.xml     | 27 +++++++++++++++++++
 public_html/esercizi/ex1-5.xml     | 27 +++++++++++++++++++
 public_html/esercizi/ex1-6.xml     | 21 +++++++++++++++
 public_html/esercizi/ex1-7.xml     | 43 ++++++++++++++++++++++++++++++
 server/com/company/esercizi.xml    | 12 +++++++--
 13 files changed, 272 insertions(+), 6 deletions(-)
 create mode 100644 public_html/esercizi/demorgan3.xml
 create mode 100644 public_html/esercizi/demorgan4.xml
 create mode 100644 public_html/esercizi/em.xml
 create mode 100644 public_html/esercizi/ex1-1.xml
 create mode 100644 public_html/esercizi/ex1-2.xml
 create mode 100644 public_html/esercizi/ex1-3.xml
 create mode 100644 public_html/esercizi/ex1-4.xml
 create mode 100644 public_html/esercizi/ex1-5.xml
 create mode 100644 public_html/esercizi/ex1-6.xml
 create mode 100644 public_html/esercizi/ex1-7.xml

diff --git a/public_html/esercizi/demorgan.xml b/public_html/esercizi/demorgan.xml
index 68c079b..42422a3 100644
--- a/public_html/esercizi/demorgan.xml
+++ b/public_html/esercizi/demorgan.xml
@@ -20,8 +20,8 @@
 		</formula>
 	</tesi>
 	<valutazione>
-		<click>13</click>
+		<click>7</click>
 		<tempo>60</tempo>
-		<altezza>5</altezza>
+		<altezza>12</altezza>
 	</valutazione>
 </esercizio>
diff --git a/public_html/esercizi/demorgan2.xml b/public_html/esercizi/demorgan2.xml
index 1445f1f..0180d6e 100644
--- a/public_html/esercizi/demorgan2.xml
+++ b/public_html/esercizi/demorgan2.xml
@@ -20,8 +20,8 @@
 		</formula>
 	</tesi>
 	<valutazione>
-		<click>13</click>
+		<click>7</click>
 		<tempo>60</tempo>
-		<altezza>5</altezza>
+		<altezza>12</altezza>
 	</valutazione>
 </esercizio>
diff --git a/public_html/esercizi/demorgan3.xml b/public_html/esercizi/demorgan3.xml
new file mode 100644
index 0000000..bab54a8
--- /dev/null
+++ b/public_html/esercizi/demorgan3.xml
@@ -0,0 +1,27 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+			<formula type="not">
+				<formula type="or">
+					<formula type="not">
+						<formula type="literal">A</formula>
+					</formula>
+					<formula type="not">
+						<formula type="literal">B</formula>
+					</formula>
+                        	</formula>
+                        </formula>
+			<formula type="and">
+				<formula type="literal">A</formula>
+				<formula type="literal">B</formula>
+                        </formula>
+		</formula>
+	</tesi>
+	<valutazione>
+		<click>7</click>
+		<tempo>60</tempo>
+		<altezza>12</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/demorgan4.xml b/public_html/esercizi/demorgan4.xml
new file mode 100644
index 0000000..abf715a
--- /dev/null
+++ b/public_html/esercizi/demorgan4.xml
@@ -0,0 +1,27 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+			<formula type="not">
+				<formula type="and">
+					<formula type="not">
+						<formula type="literal">A</formula>
+					</formula>
+					<formula type="not">
+						<formula type="literal">B</formula>
+					</formula>
+                        	</formula>
+                        </formula>
+			<formula type="or">
+				<formula type="literal">A</formula>
+				<formula type="literal">B</formula>
+                        </formula>
+		</formula>
+	</tesi>
+	<valutazione>
+		<click>7</click>
+		<tempo>60</tempo>
+		<altezza>12</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/em.xml b/public_html/esercizi/em.xml
new file mode 100644
index 0000000..2f9965e
--- /dev/null
+++ b/public_html/esercizi/em.xml
@@ -0,0 +1,17 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="or">
+			<formula type="literal">A</formula>
+		        <formula type="not">
+			        <formula type="literal">A</formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>7</click>
+		<tempo>60</tempo>
+		<altezza>12</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-1.xml b/public_html/esercizi/ex1-1.xml
new file mode 100644
index 0000000..77fb949
--- /dev/null
+++ b/public_html/esercizi/ex1-1.xml
@@ -0,0 +1,21 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+			<formula type="literal">A</formula>
+			<formula type="or">
+				<formula type="literal">A</formula>
+			        <formula type="and">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>3</click>
+		<tempo>20</tempo>
+		<altezza>3</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-2.xml b/public_html/esercizi/ex1-2.xml
new file mode 100644
index 0000000..ab20055
--- /dev/null
+++ b/public_html/esercizi/ex1-2.xml
@@ -0,0 +1,21 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+			<formula type="or">
+				<formula type="literal">A</formula>
+			        <formula type="and">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+			<formula type="literal">A</formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>4</click>
+		<tempo>20</tempo>
+		<altezza>6</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-3.xml b/public_html/esercizi/ex1-3.xml
new file mode 100644
index 0000000..4d62ab6
--- /dev/null
+++ b/public_html/esercizi/ex1-3.xml
@@ -0,0 +1,27 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+		        <formula type="impl">
+		                <formula type="and">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">B</formula>
+                                </formula>
+				<formula type="literal">C</formula>
+                        </formula>
+			<formula type="impl">
+				<formula type="literal">A</formula>
+			        <formula type="impl">
+				        <formula type="literal">B</formula>
+				        <formula type="literal">C</formula>
+                                </formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>7</click>
+		<tempo>60</tempo>
+		<altezza>8</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-4.xml b/public_html/esercizi/ex1-4.xml
new file mode 100644
index 0000000..4db2c07
--- /dev/null
+++ b/public_html/esercizi/ex1-4.xml
@@ -0,0 +1,27 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+		        <formula type="not">
+		                <formula type="or">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+			<formula type="and">
+			        <formula type="not">
+				        <formula type="literal">A</formula>
+                                </formula>
+			        <formula type="not">
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>11</click>
+		<tempo>90</tempo>
+		<altezza>12</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-5.xml b/public_html/esercizi/ex1-5.xml
new file mode 100644
index 0000000..5ae49da
--- /dev/null
+++ b/public_html/esercizi/ex1-5.xml
@@ -0,0 +1,27 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+			<formula type="and">
+			        <formula type="not">
+				        <formula type="literal">A</formula>
+                                </formula>
+			        <formula type="not">
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+		        <formula type="not">
+		                <formula type="or">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">B</formula>
+                                </formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>8</click>
+		<tempo>90</tempo>
+		<altezza>12</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-6.xml b/public_html/esercizi/ex1-6.xml
new file mode 100644
index 0000000..e53a283
--- /dev/null
+++ b/public_html/esercizi/ex1-6.xml
@@ -0,0 +1,21 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+		        <formula type="impl">
+		                <formula type="impl">
+				        <formula type="literal">A</formula>
+				        <formula type="literal">bot</formula>
+                                </formula>
+				<formula type="literal">bot</formula>
+                        </formula>
+		        <formula type="literal">A</formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>7</click>
+		<tempo>60</tempo>
+		<altezza>8</altezza>
+	</valutazione>
+</esercizio>
diff --git a/public_html/esercizi/ex1-7.xml b/public_html/esercizi/ex1-7.xml
new file mode 100644
index 0000000..903707f
--- /dev/null
+++ b/public_html/esercizi/ex1-7.xml
@@ -0,0 +1,43 @@
+<esercizio>
+	<ipotesi>
+	</ipotesi>
+	<tesi>
+		<formula type="impl">
+		        <formula type="impl">
+		                <formula type="and">
+				        <formula type="literal">C</formula>
+				        <formula type="literal">G</formula>
+                                </formula>
+				<formula type="literal">E</formula>
+                        </formula>
+		        <formula type="impl">
+		                <formula type="impl">
+		                        <formula type="not">
+				                <formula type="literal">L</formula>
+                                        </formula>
+		                        <formula type="or">
+				                <formula type="literal">E</formula>
+				                <formula type="literal">C</formula>
+                                        </formula>
+                                </formula>
+		                <formula type="impl">
+		                        <formula type="or">
+				                <formula type="literal">G</formula>
+				                <formula type="literal">L</formula>
+                                        </formula>
+		                        <formula type="impl">
+		                                <formula type="not">
+				                        <formula type="literal">L</formula>
+                                                </formula>
+				                <formula type="literal">E</formula>
+                                        </formula>
+                                </formula>
+                        </formula>
+                </formula>
+	</tesi>
+	<valutazione>
+		<click>14</click>
+		<tempo>240</tempo>
+		<altezza>20</altezza>
+	</valutazione>
+</esercizio>
diff --git a/server/com/company/esercizi.xml b/server/com/company/esercizi.xml
index c28cd97..5f4d3d6 100644
--- a/server/com/company/esercizi.xml
+++ b/server/com/company/esercizi.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <esercizi>
-  <esercizio md5="e687f326a904946f498421a0409916bf">aalbero.xml</esercizio>
-  <esercizio md5="d3d4772339c39d408a1b92a24d3c9311">tautologia.xml</esercizio>
   <esercizio md5="2a54f15678d8b0fa3b2d1f3824dfd7b6">demorgan.xml</esercizio>
   <esercizio md5="4bfe78fb51248594a8b98ba51eff769f">triviale.xml</esercizio>
   <esercizio md5="97c0cdde7504597040d100cfe3aa1644">test.xml</esercizio>
   <esercizio md5="3c217b2132e40729b6c56c39073a356a">risolvibile.xml</esercizio>
   <esercizio md5="62b5ca97fbf8a5845185ae6010e26828">demorgan2.xml</esercizio>
+  <esercizio md5="ada74dfbbd17a75aee6ba5fae31ee33f">ex1-7.xml</esercizio>
+  <esercizio md5="1a0d5371bcdbb0cd4afc4af210420363">ex1-5.xml</esercizio>
+  <esercizio md5="967f0a419f684f69a20e9d08105cfcbb">em.xml</esercizio>
+  <esercizio md5="2248dfc7da30aa1f72aa8cf97bacd1f7">demorgan4.xml</esercizio>
+  <esercizio md5="f7daa5d6f6d3740d5eae48ff9b55ccef">ex1-6.xml</esercizio>
+  <esercizio md5="53019fa1275f27297c89219bf4c0202d">ex1-1.xml</esercizio>
+  <esercizio md5="23321359eab828d8de27cb8eb7c3e0f3">ex1-3.xml</esercizio>
+  <esercizio md5="b191cf1e59233795dcdb270a8d2bda80">demorgan3.xml</esercizio>
+  <esercizio md5="4e31b527b1c238a6a3f7d5f5e7608894">ex1-2.xml</esercizio>
+  <esercizio md5="07e382ab230a1b2e9618e32c71855dab">ex1-4.xml</esercizio>
 </esercizi>
-- 
2.39.2