From 53fbf4da4af0e4d55f986a5a34dcf70baa5e5cbf Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 1 Mar 2018 11:28:26 +0100
Subject: [PATCH 01/14] Added powershell script
---
sendEmail.ps1 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 sendEmail.ps1
diff --git a/sendEmail.ps1 b/sendEmail.ps1
new file mode 100644
index 0000000..e69de29
From f5466efaeba42a6fd31d78ae49cab28e30d6ff43 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 15 Mar 2018 15:26:56 +0100
Subject: [PATCH 02/14] changes
---
.gitignore | 4 ++++
load.sh | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 66b35c6..6fd86bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
*.swp
*.log
+.DS_Store
+
+
+
diff --git a/load.sh b/load.sh
index bfa15c4..9f57fa0 100755
--- a/load.sh
+++ b/load.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-echo -n "Buongiorno "; whoami
-echo "Il sistema verrĂ aggiornato";
+echo -n "Hi "; whoami
+echo "System is going to be updated";
sleep 3
@@ -8,3 +8,4 @@ sudo apt update
sudo apt upgrade
echo "System is now up to date"
+echo "caioooooooooooooooooooooooooooooOO"
From 05193b03d8f79ddbb3484a4658b264fc6313792d Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 15 Mar 2018 15:35:08 +0100
Subject: [PATCH 03/14] added new
---
new | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 new
diff --git a/new b/new
new file mode 100644
index 0000000..c6f9d2a
--- /dev/null
+++ b/new
@@ -0,0 +1,2 @@
+sidufnaisdf
+ciao
From b9acaa8f028f5dd90b5135d8b0f461f76d432da1 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Fri, 16 Mar 2018 11:56:38 +0100
Subject: [PATCH 04/14] added new file
---
.gitignore | 1 +
nuovo_file | 3 +++
2 files changed, 4 insertions(+)
create mode 100644 nuovo_file
diff --git a/.gitignore b/.gitignore
index 6fd86bf..0f4b33d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.swp
*.log
.DS_Store
+/**/.DS_Store
diff --git a/nuovo_file b/nuovo_file
new file mode 100644
index 0000000..1802a74
--- /dev/null
+++ b/nuovo_file
@@ -0,0 +1,3 @@
+aaa
+bbb
+ccc
From e87648f102f4b95138274beb51c64b60301416c8 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Fri, 16 Mar 2018 11:57:27 +0100
Subject: [PATCH 05/14] change new file
---
nuovo_file | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nuovo_file b/nuovo_file
index 1802a74..0012ca8 100644
--- a/nuovo_file
+++ b/nuovo_file
@@ -1,3 +1,4 @@
aaa
-bbb
ccc
+bbb
+
From 91dea65c4e5101ec9cf5dbd6ff6ce6aab9ca69e2 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Wed, 21 Mar 2018 15:42:30 +0100
Subject: [PATCH 06/14] changed new
---
new | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/new b/new
index c6f9d2a..aae00b1 100644
--- a/new
+++ b/new
@@ -1,2 +1 @@
-sidufnaisdf
-ciao
+changes made on the branch
From 935f012f96f2731489a1530e3e33eb2a9bd680d4 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Wed, 21 Mar 2018 19:27:48 +0100
Subject: [PATCH 07/14] added PM
---
PatternMatching/BitPattern.c | 187 +++++++++++++++++++++++++++++++++++
PatternMatching/README.md | 7 ++
2 files changed, 194 insertions(+)
create mode 100644 PatternMatching/BitPattern.c
create mode 100644 PatternMatching/README.md
diff --git a/PatternMatching/BitPattern.c b/PatternMatching/BitPattern.c
new file mode 100644
index 0000000..8714abe
--- /dev/null
+++ b/PatternMatching/BitPattern.c
@@ -0,0 +1,187 @@
+/* Implementazione dell'Algoritmo BitPattern per il PatternMatching.
+L'algoritmo controlla quante volte il pattern P viene ripetuto nel testo T.
+(Si presuppone un tempo di esecuzione O(n)).
+*/
+
+#include
+#include
+#include
+#include "Lunghezza.h"
+
+/* Prototipi di funzioni:*/
+
+void buildArray(int ar[], char *testo, char k); // costruisce i vettori Ux settando a 1 le posizioni in cui x compare nel pattern P, per ogni x dell'alfabeto del testo T.
+void printArray(int ar[], int dim); // stampa a video un array
+int occurrency(char *testo, char *pattern, int l_testo, int l_pattern); // conteggio occorrenze tramite la matrice m(i,j);
+char *substring(char *t1, int in, int f); //copia nell'array temp la sottostringa di lunghezza i dell'array t1
+int *shiftRight(int *p, int i); // shifta a destra il puntatore p
+int *logicAnd(int *p, int v[], int i); // AND logico
+
+int main() {
+ char *testo=(char *)malloc(sizeof(char)*5000000000);
+ char *pattern=(char *)malloc(sizeof(char)*10);
+ printf("Inserisci il testo T ");
+ scanf("%s", testo);
+ printf("Inserisci il pattern P ");
+ scanf("%s", pattern);
+ int lunghTesto=length(testo);
+ int lunghPattern=length(pattern);
+ printf("Ci sono %d occorrenze del pattern P nel testo T\n", occurrency(testo, pattern, lunghTesto, lunghPattern));
+}
+int occurrency(char *testo, char *pattern, int l_testo, int l_pattern){
+ /*
+ DEFINIZIONE DEL CALCOLO DELLA MATRICE M
+ M(i,j)=1 sse P[: j] = T[i-j+1 : i]
+ -- La variabile count memorizza il numero di occorrenze del pattern P nel testo T --
+ Se M(i,j) == 1 quando j==l_pattern --> Incremento di 1 il contatore count
+
+ Passo 1: Costruzione dei vettori Ux per ogni x dell'alfabeto sigma
+ */
+
+ int a[l_pattern]; buildArray(a, pattern, 'a');
+ int b[l_pattern]; buildArray(b, pattern, 'b');
+ int c[l_pattern]; buildArray(c, pattern, 'c');
+ int d[l_pattern]; buildArray(d, pattern, 'd');
+ int e[l_pattern]; buildArray(e, pattern, 'e');
+ int f[l_pattern]; buildArray(f, pattern, 'f');
+ int g[l_pattern]; buildArray(g, pattern, 'g');
+ int h[l_pattern]; buildArray(h, pattern, 'h');
+ int i[l_pattern]; buildArray(i, pattern, 'i');
+ int j[l_pattern]; buildArray(j, pattern, 'j');
+ int k[l_pattern]; buildArray(k, pattern, 'k');
+ int l[l_pattern]; buildArray(l, pattern, 'l');
+ int m[l_pattern]; buildArray(m, pattern, 'm');
+ int n[l_pattern]; buildArray(n, pattern, 'n');
+ int o[l_pattern]; buildArray(o, pattern, 'o');
+ int p[l_pattern]; buildArray(p, pattern, 'p');
+ int q[l_pattern]; buildArray(q, pattern, 'q');
+ int r[l_pattern]; buildArray(r, pattern, 'r');
+ int s[l_pattern]; buildArray(s, pattern, 's');
+ int t[l_pattern]; buildArray(t, pattern, 't');
+ int u[l_pattern]; buildArray(u, pattern, 'u');
+ int v[l_pattern]; buildArray(v, pattern, 'v');
+ int w[l_pattern]; buildArray(w, pattern, 'w');
+ int x[l_pattern]; buildArray(x, pattern, 'x');
+ int y[l_pattern]; buildArray(y, pattern, 'y');
+ int z[l_pattern]; buildArray(z, pattern, 'z');
+
+ /* la prima riga della matrice m
+ viene calcolata esplicitamente
+ seguendo la definizione
+ */
+ int m1[l_pattern];
+ int j1;
+ char * subPattern=substring(pattern, 1, 1); // P[: j]
+ char * subTesto=substring(testo, 1, 1); // T[i-j+1: i]
+ if (subPattern[0]==subTesto[0])
+ m1[0]=1;
+ else
+ m1[0]=0;
+ for(j1=1; j1Algoritmi di pattern matching
+Implementazione LCS in Java
+
+Copyright by "Dima"
+With help of Fabri " The Fibra" Zirelli
+
From 5e7c7a605c17e7095fe978cce40b8c5b138e0730 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Wed, 21 Mar 2018 20:56:46 +0100
Subject: [PATCH 08/14] some changes
---
PatternMatching/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PatternMatching/README.md b/PatternMatching/README.md
index 0a98f29..fc866fe 100644
--- a/PatternMatching/README.md
+++ b/PatternMatching/README.md
@@ -1,7 +1,7 @@
# PatternMatching
-Algoritmi di pattern matching
+-- Algoritmi di pattern matching --
Implementazione LCS in Java
-Copyright by "Dima"
+Copyright by "MarcoDima"
With help of Fabri " The Fibra" Zirelli
From 4566893cef738eb767235189481a49c7cdfb2792 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 22 Mar 2018 14:10:16 +0100
Subject: [PATCH 09/14] remove PM
---
PatternMatching/BitPattern.c | 187 -----------------------------------
PatternMatching/README.md | 7 --
2 files changed, 194 deletions(-)
delete mode 100644 PatternMatching/BitPattern.c
delete mode 100644 PatternMatching/README.md
diff --git a/PatternMatching/BitPattern.c b/PatternMatching/BitPattern.c
deleted file mode 100644
index 8714abe..0000000
--- a/PatternMatching/BitPattern.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Implementazione dell'Algoritmo BitPattern per il PatternMatching.
-L'algoritmo controlla quante volte il pattern P viene ripetuto nel testo T.
-(Si presuppone un tempo di esecuzione O(n)).
-*/
-
-#include
-#include
-#include
-#include "Lunghezza.h"
-
-/* Prototipi di funzioni:*/
-
-void buildArray(int ar[], char *testo, char k); // costruisce i vettori Ux settando a 1 le posizioni in cui x compare nel pattern P, per ogni x dell'alfabeto del testo T.
-void printArray(int ar[], int dim); // stampa a video un array
-int occurrency(char *testo, char *pattern, int l_testo, int l_pattern); // conteggio occorrenze tramite la matrice m(i,j);
-char *substring(char *t1, int in, int f); //copia nell'array temp la sottostringa di lunghezza i dell'array t1
-int *shiftRight(int *p, int i); // shifta a destra il puntatore p
-int *logicAnd(int *p, int v[], int i); // AND logico
-
-int main() {
- char *testo=(char *)malloc(sizeof(char)*5000000000);
- char *pattern=(char *)malloc(sizeof(char)*10);
- printf("Inserisci il testo T ");
- scanf("%s", testo);
- printf("Inserisci il pattern P ");
- scanf("%s", pattern);
- int lunghTesto=length(testo);
- int lunghPattern=length(pattern);
- printf("Ci sono %d occorrenze del pattern P nel testo T\n", occurrency(testo, pattern, lunghTesto, lunghPattern));
-}
-int occurrency(char *testo, char *pattern, int l_testo, int l_pattern){
- /*
- DEFINIZIONE DEL CALCOLO DELLA MATRICE M
- M(i,j)=1 sse P[: j] = T[i-j+1 : i]
- -- La variabile count memorizza il numero di occorrenze del pattern P nel testo T --
- Se M(i,j) == 1 quando j==l_pattern --> Incremento di 1 il contatore count
-
- Passo 1: Costruzione dei vettori Ux per ogni x dell'alfabeto sigma
- */
-
- int a[l_pattern]; buildArray(a, pattern, 'a');
- int b[l_pattern]; buildArray(b, pattern, 'b');
- int c[l_pattern]; buildArray(c, pattern, 'c');
- int d[l_pattern]; buildArray(d, pattern, 'd');
- int e[l_pattern]; buildArray(e, pattern, 'e');
- int f[l_pattern]; buildArray(f, pattern, 'f');
- int g[l_pattern]; buildArray(g, pattern, 'g');
- int h[l_pattern]; buildArray(h, pattern, 'h');
- int i[l_pattern]; buildArray(i, pattern, 'i');
- int j[l_pattern]; buildArray(j, pattern, 'j');
- int k[l_pattern]; buildArray(k, pattern, 'k');
- int l[l_pattern]; buildArray(l, pattern, 'l');
- int m[l_pattern]; buildArray(m, pattern, 'm');
- int n[l_pattern]; buildArray(n, pattern, 'n');
- int o[l_pattern]; buildArray(o, pattern, 'o');
- int p[l_pattern]; buildArray(p, pattern, 'p');
- int q[l_pattern]; buildArray(q, pattern, 'q');
- int r[l_pattern]; buildArray(r, pattern, 'r');
- int s[l_pattern]; buildArray(s, pattern, 's');
- int t[l_pattern]; buildArray(t, pattern, 't');
- int u[l_pattern]; buildArray(u, pattern, 'u');
- int v[l_pattern]; buildArray(v, pattern, 'v');
- int w[l_pattern]; buildArray(w, pattern, 'w');
- int x[l_pattern]; buildArray(x, pattern, 'x');
- int y[l_pattern]; buildArray(y, pattern, 'y');
- int z[l_pattern]; buildArray(z, pattern, 'z');
-
- /* la prima riga della matrice m
- viene calcolata esplicitamente
- seguendo la definizione
- */
- int m1[l_pattern];
- int j1;
- char * subPattern=substring(pattern, 1, 1); // P[: j]
- char * subTesto=substring(testo, 1, 1); // T[i-j+1: i]
- if (subPattern[0]==subTesto[0])
- m1[0]=1;
- else
- m1[0]=0;
- for(j1=1; j1-- Algoritmi di pattern matching --
-Implementazione LCS in Java
-
-Copyright by "MarcoDima"
-With help of Fabri " The Fibra" Zirelli
-
From cd6438138bf4f58be99989a12bc4148dd9c76889 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 22 Mar 2018 14:12:59 +0100
Subject: [PATCH 10/14] added PM
---
PatternMatching/README.md | 7 +++++++
PatternMatching/master | 1 +
2 files changed, 8 insertions(+)
create mode 100644 PatternMatching/README.md
create mode 100644 PatternMatching/master
diff --git a/PatternMatching/README.md b/PatternMatching/README.md
new file mode 100644
index 0000000..166ecbc
--- /dev/null
+++ b/PatternMatching/README.md
@@ -0,0 +1,7 @@
+# PatternMatching
+-- Algoritmi di pattern matching --
+Implementazione LCS in Java
+
+Copyright by "Dima"
+With help of Fabri " The Fibra" Zirelli
+AND OTHER CHANGES
diff --git a/PatternMatching/master b/PatternMatching/master
new file mode 100644
index 0000000..66d4a0a
--- /dev/null
+++ b/PatternMatching/master
@@ -0,0 +1 @@
+on master
From 5e80f1d26efbabfbace32065795d3c7ab07c7566 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 22 Mar 2018 15:10:48 +0100
Subject: [PATCH 11/14] temp commit
---
PatternMatching/README.md | 7 -------
PatternMatching/master | 1 -
2 files changed, 8 deletions(-)
delete mode 100644 PatternMatching/README.md
delete mode 100644 PatternMatching/master
diff --git a/PatternMatching/README.md b/PatternMatching/README.md
deleted file mode 100644
index 166ecbc..0000000
--- a/PatternMatching/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# PatternMatching
--- Algoritmi di pattern matching --
-Implementazione LCS in Java
-
-Copyright by "Dima"
-With help of Fabri " The Fibra" Zirelli
-AND OTHER CHANGES
diff --git a/PatternMatching/master b/PatternMatching/master
deleted file mode 100644
index 66d4a0a..0000000
--- a/PatternMatching/master
+++ /dev/null
@@ -1 +0,0 @@
-on master
From 2f92df9f6748376a8bc2856b8f75ea0d439cafb2 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Thu, 22 Mar 2018 15:31:39 +0100
Subject: [PATCH 12/14] merge branch master on submodule
---
.gitmodules | 3 +++
PatternMatching | 1 +
2 files changed, 4 insertions(+)
create mode 100644 .gitmodules
create mode 160000 PatternMatching
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..bf4f7b5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "PatternMatching"]
+ path = PatternMatching
+ url = https://github.com/MarcoDima/PatternMatching.git
diff --git a/PatternMatching b/PatternMatching
new file mode 160000
index 0000000..f09998a
--- /dev/null
+++ b/PatternMatching
@@ -0,0 +1 @@
+Subproject commit f09998a6f3daf6fca917d0c171ca08676bf3defe
From 5492350d4715817b4e8330270ca435bedde4765b Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Wed, 22 Aug 2018 12:59:03 +0200
Subject: [PATCH 13/14] deleted new
---
new | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 new
diff --git a/new b/new
deleted file mode 100644
index aae00b1..0000000
--- a/new
+++ /dev/null
@@ -1 +0,0 @@
-changes made on the branch
From 7ee49095ffb73ad39d08104dcdf51582d6d779c9 Mon Sep 17 00:00:00 2001
From: Marco Di Martino
Date: Wed, 22 Aug 2018 13:21:55 +0200
Subject: [PATCH 14/14] modif. PatternMatching
---
PatternMatching | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PatternMatching b/PatternMatching
index f09998a..4084bc7 160000
--- a/PatternMatching
+++ b/PatternMatching
@@ -1 +1 @@
-Subproject commit f09998a6f3daf6fca917d0c171ca08676bf3defe
+Subproject commit 4084bc7d6a7e324dc7e4a1d29f47063d6a7ec0c6