From 52f7e3882b00977d41837b988444dad1d5410bc6 Mon Sep 17 00:00:00 2001
From: Britta Heymann <britta_hey@web.de>
Date: Wed, 20 Sep 2017 10:54:21 +0200
Subject: [PATCH] Revert "Use x^21 instead of x^3"
This reverts commit 4b007895972df04dfec1cab85c3ac9e5ddb7b18d.
---
src/core/LocalDatabase.java | 6 ++----
src/test/DatabaseStatisticsTest.java | 4 ++--
src/test/EpidemicRouterTest.java | 6 +++---
src/test/LocalDatabaseTest.java | 2 +-
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/core/LocalDatabase.java b/src/core/LocalDatabase.java
index ace72171..608ee8e1 100644
--- a/src/core/LocalDatabase.java
+++ b/src/core/LocalDatabase.java
@@ -20,9 +20,7 @@ import java.util.stream.Collectors;
* Created by melanie on 07.04.17.
*/
public class LocalDatabase {
- /** Utility threshold for deletion is computed using (used db percentage)^{THRESHOLD_EXPONENT}.*/
- private static final int THRESHOLD_EXPONENT = 21;
-
+ private static final int CUBIC = 3;
private static final int METERS_IN_KILOMETER = 1000;
private static final int SECONDS_IN_HOUR = 3600;
@@ -117,7 +115,7 @@ public class LocalDatabase {
* @return A threshold between 0 and 1 that is 0 for empty memory and 1 for full memory.
*/
private double computeDeletionThreshold() {
- return Math.pow(getUsedMemoryPercentage(), THRESHOLD_EXPONENT);
+ return Math.pow(getUsedMemoryPercentage(), CUBIC);
}
/**
diff --git a/src/test/DatabaseStatisticsTest.java b/src/test/DatabaseStatisticsTest.java
index 14638236..bab79ed3 100644
--- a/src/test/DatabaseStatisticsTest.java
+++ b/src/test/DatabaseStatisticsTest.java
@@ -36,8 +36,8 @@ public class DatabaseStatisticsTest {
private static final double HALF_AN_HOUR_LATER =3600;
/* Used locations for all DB operations. */
- private static final Coord CURR_LOCATION = new Coord(3000, 4000);
- private static final Coord CLOSE_TO_CURR_LOCATION = new Coord(4000, 4000);
+ private static final Coord CURR_LOCATION = new Coord(300, 400);
+ private static final Coord CLOSE_TO_CURR_LOCATION = new Coord(400, 400);
private static final Coord ORIGIN = new Coord(0,0);
/* Sizes for data items */
diff --git a/src/test/EpidemicRouterTest.java b/src/test/EpidemicRouterTest.java
index 6dd8e91f..09af79e8 100644
--- a/src/test/EpidemicRouterTest.java
+++ b/src/test/EpidemicRouterTest.java
@@ -27,10 +27,10 @@ import java.util.List;
public class EpidemicRouterTest extends AbstractRouterTest {
private static int TTL = 300;
- private static final int NINE_HOURS = 9 * 60 * 60;
+ private static final int THREE_HOURS = 10_800;
/* Data base item sizes needed for tests. */
- private static final int DB_SIZE = 100;
+ private static final int DB_SIZE = 50;
private static final int SMALL_SIZE_DIFFERENCE = 2;
private static final String EXPECTED_DATA_MESSAGE = "Data message should have been sent.";
@@ -330,7 +330,7 @@ public class EpidemicRouterTest extends AbstractRouterTest {
assertEquals("Expected other data item to be sent.", data, message.getData().get(0));
// Add another, large one to replace the original object. It is more useful so it stays in the database.
- this.clock.advance(NINE_HOURS);
+ this.clock.advance(THREE_HOURS);
DisasterData newData = new DisasterData(
DisasterData.DataType.SKILL, DB_SIZE - SMALL_SIZE_DIFFERENCE, SimClock.getTime(), h1.getLocation());
this.setUpAsDataCarrier(h1, newData);
diff --git a/src/test/LocalDatabaseTest.java b/src/test/LocalDatabaseTest.java
index fca7d307..b2706bf7 100644
--- a/src/test/LocalDatabaseTest.java
+++ b/src/test/LocalDatabaseTest.java
@@ -20,7 +20,7 @@ import java.util.List;
* Created by Britta Heymann on 09.04.2017.
*/
public class LocalDatabaseTest {
- private static final int DB_SIZE = 1000;
+ private static final int DB_SIZE = 100;
/* Used locations for all DB operations. */
private static final Coord CURR_LOCATION = new Coord(300, 400);
--
GitLab