From 64c3d23bd81e6f671ee084bddedf21d43c87fcd5 Mon Sep 17 00:00:00 2001
From: emtunhei <emtunhei@stud.ntnu.no>
Date: Mon, 4 Apr 2022 08:46:23 +0200
Subject: [PATCH] updated the DB class to search for dryingperiods containing
actual data instead of just the dates
---
.../java/com/application/DB/Constants.java | 2 ++
src/main/java/com/application/DB/DB.java | 8 ++++----
target/classes/com/application/Main.class | Bin 8003 -> 8003 bytes
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index b2f5926..0f56afc 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -2,6 +2,8 @@ package com.application.DB;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
/**
* This class contains constants to be used related to database activities
diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index f0d3e4e..70adc81 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -161,11 +161,11 @@ public class DB {
- Map<String, String> results;
+ Map<Integer, Map<String, Number>> results;
while(true){
System.out.printf("\nExtra parameters:\n %s\n\n",extraInputParameter);
// Retrieves the dates
- results = getZeroPointDate(extraInputParameter);
+ results = getKwh(getZeroPointDate(extraInputParameter));
// Checks if any dates where found, if not parameters are removed until dates are found
if(results.size()<NUMBER_OF_PERIODS){
@@ -177,7 +177,7 @@ public class DB {
System.out.println("Tree species is removed");
} else if(extraInputParameter.contains(dimensions)) {
extraInputParameter = extraInputParameter.replace(dimensions,"");
- System.out.println("Height is removed");
+ System.out.println("Dimensions is removed");
} else if(extraInputParameter.contains(moistureGoal)) {
extraInputParameter = extraInputParameter.replace(moistureGoal,"");
System.out.println("Moisture goal is removed");
@@ -185,7 +185,7 @@ public class DB {
}
else break;
}
- return getKwh(results);
+ return results;
}
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 1dcf1e91cb8fc136fad037b6b65ee7ce6f1528ab..b75fd902a89b66c4ea42cc02d24828f3f32a6494 100644
GIT binary patch
delta 47
zcmX?Xci3*jDp^)J26jgI$?Ik9S(O;r8I>o0mbGV9V_;`gpKLB?&#J}1&Zs@PTJ8h@
DDz*!4
delta 47
zcmX?Xci3*jDp^)(26jf7$?Ik9S>+kn85JgfmbGV9W?*MjnQSg+&#KPA&ZsfDTJ8h@
DD5eWl
--
GitLab