From feb37c5366b33a680cea4883f432693e2f7992c4 Mon Sep 17 00:00:00 2001
From: unknown <lvalentim@ua.pt>
Date: Thu, 7 Jan 2021 22:07:10 +0000
Subject: [PATCH] =?UTF-8?q?Valores=20de=20ph=20mais=20relevantes,=20update?=
 =?UTF-8?q?=20de=20documenta=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Blossom_Gen/Blossom_Gerador/Gerador.java  | 46 ++++++++++++++-----
 .../Blossom_Gerador/MonitorPH.java            |  6 +--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/Gerador.java b/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/Gerador.java
index e05155e..a036db3 100644
--- a/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/Gerador.java
+++ b/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/Gerador.java
@@ -83,10 +83,10 @@ public static void main(String[] args) throws InterruptedException, IOException{
 		//Adicionar todos os valores de pH à base de dados
 		for(int i = 0; i<monitoresPH.size(); i++) {
 			for(int z = 0; z<monitoresPH.get(i).getValues().size(); z++) {
+				//Curl em windows
 				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(monitoresPH.get(i).getId()) + " \\\", \\\"value\\\" : \\\" " + Double.toString(monitoresPH.get(i).getValues().get(z)) +  " \\\"}\" http://localhost:8080/api/test/phmeasures";
-				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(monitoresPH.get(i).getId()) + " \", \"value\" : \" " + Double.toString(monitoresPH.get(i).getValues().get(z)) + " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
-				// curl -X POST -H "Content-Type: application/json" -d '{"sensorId" : "4", "value" : "7.6"}' http://localhost:8080/api/test/phmeasures
-				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \"" + Integer.toString(monitoresPH.get(i).getId()) + "\", \"value\" : \"" + Double.toString(monitoresPH.get(i).getValues().get(z)) +"\"}\' \"http://localhost:8080/api/test/phmeasures\"";
+				
+				//Curl em Linux
 				String[] com = {"curl", "-X", "POST", "-H", "Content-Type: application/json", "-d", "{\"sensorId\" : \"" + Integer.toString(monitoresPH.get(i).getId()) + "\", \"value\" : \"" + Double.toString(monitoresPH.get(i).getValues().get(z)) +"\"}", "http://localhost:8080/api/test/phmeasures"};
 				try {
 					pr = rt.exec(com);
@@ -99,9 +99,10 @@ public static void main(String[] args) throws InterruptedException, IOException{
 		//Adicionar todos os valores de humidade à base de dados
 		for(int i = 0; i<monitoresHum.size(); i++) {
 			for(int z = 0; z<monitoresHum.get(i).getValues().size(); z++) {
+				//Curl em windows
 				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(monitoresHum.get(i).getId()) + " \\\", \\\"value\\\" : \\\" " + Integer.toString(monitoresHum.get(i).getValues().get(z)) +  " \\\"}\" http://localhost:8080/api/test/hummeasures";
-				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(monitoresHum.get(i).getId()) + " \", \"value\" : \" " + Double.toString(monitoresHum.get(i).getValues().get(z)) +  " \"}\' http://localhost:8080/api/test/hummeasures"; //Se estiver a correr em linux
-				// String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \"" + Integer.toString(monitoresHum.get(i).getId()) + "\", \"value\" : \"" + Double.toString(monitoresHum.get(i).getValues().get(z)) +"\"}\' \"http://localhost:8080/api/test/hummeasures\"";
+				
+				//Curl em Linux
 				String[] com = {"curl", "-X", "POST", "-H", "Content-Type: application/json", "-d", "{\"sensorId\" : \"" + Integer.toString(monitoresHum.get(i).getId()) + "\", \"value\" : \"" + Double.toString(monitoresHum.get(i).getValues().get(z)) +"\"}", "http://localhost:8080/api/test/hummeasures"};
 				try {
 					pr = rt.exec(com);
@@ -120,8 +121,11 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					String mode = p.getMode();
 					if(mode == "Low") {
 						p.generateAcidicSoil(1/regs_per_day);
+						// Curl em windows 
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(p.getId()) + " \\\", \\\"value\\\" : \\\" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/phmeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						
 						try {
 							pr = rt.exec(com);
@@ -131,8 +135,12 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					}
 					if(mode == "Medium") {
 						p.generateNeutralSoil(1/regs_per_day);
+						
+						// Curl em windows
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(p.getId()) + " \\\", \\\"value\\\" : \\\" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/phmeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						try {
 							pr = rt.exec(com);
 						}catch(Exception e) {
@@ -141,8 +149,12 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					}
 					if(mode == "High") {
 						p.generateBasicSoil(1/regs_per_day);
+						
+						// Curl em windows
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(p.getId()) + " \\\", \\\"value\\\" : \\\" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/phmeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(p.getId()) + " \", \"value\" : \" " + Double.toString(p.getValues().get(p.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						try {
 							pr = rt.exec(com);
 						}catch(Exception e) {
@@ -157,8 +169,12 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					String mode = h.getMode();
 					if(mode == "Low") {
 						h.generateDrySoil(1/regs_per_day);
+						
+						// Curl em windows
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(h.getId()) + " \\\", \\\"value\\\" : \\\" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/hummeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						try {
 							pr = rt.exec(com);
 						}catch(Exception e) {
@@ -167,8 +183,12 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					}
 					if(mode == "Medium") {
 						h.generateNeutralSoil(1/regs_per_day);
+						
+						// Curl em windows
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(h.getId()) + " \\\", \\\"value\\\" : \\\" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/hummeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						try {
 							pr = rt.exec(com);
 						}catch(Exception e) {
@@ -177,8 +197,12 @@ public static void main(String[] args) throws InterruptedException, IOException{
 					}
 					if(mode == "High") {
 						h.generateMoistSoil(1/regs_per_day);
+						
+						//Curl em windows
 						// String com = "curl -X POST -H \"Content-Type: application/json\" -d \"{\\\"sensorId\\\" : \\\" " + Integer.toString(h.getId()) + " \\\", \\\"value\\\" : \\\" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \\\"}\" http://localhost:8080/api/test/hummeasures";
-						String com = "curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"; //Se estiver a correr em linux
+						
+						//Curl em linux
+						String[] com = {"curl -X POST -H \"Content-Type: application/json\" -d \'{\"sensorId\" : \" " + Integer.toString(h.getId()) + " \", \"value\" : \" " + Integer.toString(h.getValues().get(h.getValues().size()-1)) +  " \"}\' http://localhost:8080/api/test/phmeasures"}; 
 						try {
 							pr = rt.exec(com);
 						}catch(Exception e) {
diff --git a/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/MonitorPH.java b/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/MonitorPH.java
index 8d65a70..2d634fa 100644
--- a/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/MonitorPH.java
+++ b/Blossom_Gerador/src/main/java/pt/ua/Blossom_Gen/Blossom_Gerador/MonitorPH.java
@@ -29,7 +29,7 @@ public MonitorPH(int given_id, String mode, int freq, int instant) {		//instant
 		public void generateAcidicSoil(int days) {
 			if(days>0) {
 				for(int i = 0; i<this.reg_freq*days; i++) {
-					double value = getRandomDoubleInRange(0,7);
+					double value = getRandomDoubleInRange(4,6);
 					this.values.add(value);
 				}
 			}
@@ -38,7 +38,7 @@ public void generateAcidicSoil(int days) {
 		public void generateNeutralSoil(int days) {
 			if(days>0) {
 				for(int i = 0; i<this.reg_freq*days; i++) {
-					double value = getRandomNumberUsingInts(4,10);
+					double value = getRandomNumberUsingInts(6,8);
 					this.values.add(value);
 				}
 			}
@@ -47,7 +47,7 @@ public void generateNeutralSoil(int days) {
 		public void generateBasicSoil(int days) {
 			if(days>0) {
 				for(int i = 0; i<this.reg_freq*days; i++) {
-					double value = getRandomNumberUsingInts(7,14);
+					double value = getRandomNumberUsingInts(7,9);
 					this.values.add(value);
 				}
 			}