2211482
/
PR2-travelbuddyapp
0
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix_branch'

bugfix_branch
selim 2024-06-16 05:30:46 +02:00
parent 0c1b1fbe76 d3a7b96213
commit 0f1dea7bec
2 changed files with 265 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
src/main/java/de/hs_mannheim/domain/System.java
View File

@ -43,8 +43,8 @@ public class System {
public static String decoding(String string) { public static String decoding(String string) {
byte[] binary_data = new byte[string.length()]; byte[] binary_data = new byte[string.length()];
for(int i = 0; i < string.length(); i++) { for (int i = 0; i < string.length(); i++) {
binary_data[i] = (byte)string.charAt(i); binary_data[i] = (byte) string.charAt(i);
} }
return new String(Base64.decodeBase64(binary_data)); return new String(Base64.decodeBase64(binary_data));
} }
@ -58,7 +58,7 @@ public class System {
} }
public static double parseDouble(String s) throws NumberFormatException { public static double parseDouble(String s) throws NumberFormatException {
if(s.equals("")) if (s.equals(""))
return 0; return 0;
else else
return Double.parseDouble(s); return Double.parseDouble(s);
@ -81,15 +81,15 @@ public class System {
Double.parseDouble(fileString[7]))); Double.parseDouble(fileString[7])));
} }
} catch (Exception e) { } catch (Exception e) {
// //
} }
} }
public ArrayList<String> all_user_toString(){ public ArrayList<String> all_user_toString() {
ArrayList<String> result = new ArrayList<>(); ArrayList<String> result = new ArrayList<>();
for(User user : this.all_user){ for (User user : this.all_user) {
result.add(user.toString()); result.add(user.toString());
} }
@ -111,41 +111,42 @@ public class System {
return false; return false;
} }
public boolean sign_up_user(String username, String password, String password_authentication, String hometown, String zip, public boolean sign_up_user(String username, String password, String password_authentication, String hometown,
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS){ String zip,
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS) {
double car_l_100km; double car_l_100km;
double car_avg_kmh; double car_avg_kmh;
double bike_avg_kmh; double bike_avg_kmh;
try{ try {
car_l_100km = parseDouble(car_l_100kmS); car_l_100km = parseDouble(car_l_100kmS);
car_avg_kmh = parseDouble(car_avg_kmhS); car_avg_kmh = parseDouble(car_avg_kmhS);
bike_avg_kmh = parseDouble(bike_avg_kmhS); bike_avg_kmh = parseDouble(bike_avg_kmhS);
} catch (NumberFormatException n){ } catch (NumberFormatException n) {
return false; return false;
} }
if(username.equals("")||password.equals("")||hometown.equals("")||zip.equals("")) if (username.equals("") || password.equals("") || hometown.equals("") || zip.equals(""))
return false; return false;
if(!password.equals(password_authentication)) if (!password.equals(password_authentication))
return false; return false;
for(User user: this.all_user) for (User user : this.all_user)
if(user.getUsername().equals(username)) if (user.getUsername().equals(username))
return false; return false;
ArrayList<String> mem = search(zip); ArrayList<String> mem = search(zip);
boolean bool = false; boolean bool = false;
for (String line: mem) for (String line : mem)
if(line.split(";")[1].equals(hometown)) { if (line.split(";")[1].equals(hometown)) {
bool = true; bool = true;
break; break;
} }
if(!bool) if (!bool)
return false; return false;
current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh, bike_avg_kmh); current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh, bike_avg_kmh);
@ -160,53 +161,53 @@ public class System {
} }
public boolean change_user_details(String username, String password, String hometown, String zip, public boolean change_user_details(String username, String password, String hometown, String zip,
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS){ String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS) {
double car_l_100km; double car_l_100km;
double car_avg_kmh; double car_avg_kmh;
double bike_avg_kmh; double bike_avg_kmh;
try{ try {
car_l_100km = parseDouble(car_l_100kmS); car_l_100km = parseDouble(car_l_100kmS);
car_avg_kmh = parseDouble(car_avg_kmhS); car_avg_kmh = parseDouble(car_avg_kmhS);
bike_avg_kmh = parseDouble(bike_avg_kmhS); bike_avg_kmh = parseDouble(bike_avg_kmhS);
} catch (NumberFormatException n){ } catch (NumberFormatException n) {
return false; return false;
} }
if(!current_user.getPassword().equals(password)) if (!current_user.getPassword().equals(password))
return false; return false;
if(username.equals("")||hometown.equals("")||zip.equals("")) if (username.equals("") || hometown.equals("") || zip.equals(""))
return false; return false;
if(!current_user.getUsername().equals(username)){ if (!current_user.getUsername().equals(username)) {
for(User user: this.all_user) for (User user : this.all_user)
if(user.getUsername().equals(username)) if (user.getUsername().equals(username))
return false; return false;
} }
ArrayList<String> mem = search(zip); ArrayList<String> mem = search(zip);
boolean bool = false; boolean bool = false;
for (String line: mem) for (String line : mem)
if(line.split(";")[1].equals(hometown)) { if (line.split(";")[1].equals(hometown)) {
bool = true; bool = true;
break; break;
} }
if(!bool) if (!bool)
return false; return false;
for (int i = 0; i < this.all_user.size(); i++)
for(int i = 0; i< this.all_user.size(); i++) if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
if(this.all_user.get(i).getUsername().equals(current_user.getUsername()))
this.all_user.remove(i); this.all_user.remove(i);
write_to_file(all_user_toString(), "src/main/resources/user_data.csv"); write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
write_to_file(all_user_toString(), "src/test/resources/user_data.csv"); write_to_file(all_user_toString(), "src/test/resources/user_data.csv");
this.current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh, bike_avg_kmh); this.current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh,
bike_avg_kmh);
this.all_user.add(current_user); this.all_user.add(current_user);
write_to_file(all_user_toString(), "src/main/resources/user_data.csv"); write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
@ -217,15 +218,15 @@ public class System {
} }
public boolean change_user_password(String old_password, String new_password, String new_password_authentication){ public boolean change_user_password(String old_password, String new_password, String new_password_authentication) {
if(!this.current_user.getPassword().equals(old_password)) if (!this.current_user.getPassword().equals(old_password))
return false; return false;
if(!new_password.equals(new_password_authentication)) if (!new_password.equals(new_password_authentication))
return false; return false;
for(int i = 0; i< this.all_user.size(); i++) for (int i = 0; i < this.all_user.size(); i++)
if(this.all_user.get(i).getUsername().equals(current_user.getUsername())) if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
this.all_user.remove(i); this.all_user.remove(i);
write_to_file(all_user_toString(), "src/main/resources/user_data.csv"); write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
@ -249,7 +250,7 @@ public class System {
} }
writer.write(lines.getLast()); writer.write(lines.getLast());
} catch (IOException e) { } catch (IOException e) {
// //
} }
} }
@ -257,12 +258,12 @@ public class System {
current_user = new User(); current_user = new User();
} }
public String[] getDetails(){ public String[] getDetails() {
return new String[]{current_user.getUsername(), current_user.getHometown(), return new String[] { current_user.getUsername(), current_user.getHometown(),
current_user.getZip(), current_user.getCar_name(), current_user.getZip(), current_user.getCar_name(),
current_user.getCar_l_100km()==0?"":String.valueOf(current_user.getCar_l_100km()), current_user.getCar_l_100km() == 0 ? "" : String.valueOf(current_user.getCar_l_100km()),
current_user.getCar_avg_kmh()==0?"":String.valueOf(current_user.getCar_avg_kmh()), current_user.getCar_avg_kmh() == 0 ? "" : String.valueOf(current_user.getCar_avg_kmh()),
current_user.getBike_avg_kmh()==0?"":String.valueOf(current_user.getBike_avg_kmh())}; current_user.getBike_avg_kmh() == 0 ? "" : String.valueOf(current_user.getBike_avg_kmh()) };
} }
public ArrayList<String> search(String hometown_or_zip) { public ArrayList<String> search(String hometown_or_zip) {
@ -275,11 +276,11 @@ public class System {
String line; String line;
while ((line = reader.readLine()) != null && zip_set.size() < 200) { while ((line = reader.readLine()) != null && zip_set.size() < 200) {
line = line.replace("\"", ""); line = line.replace("\"", "");
if (line.split(";")[0].contains(hometown_or_zip)||line.split(";")[1].contains(hometown_or_zip)) if (line.split(";")[0].contains(hometown_or_zip) || line.split(";")[1].contains(hometown_or_zip))
zip_set.add(line); zip_set.add(line);
} }
} catch (Exception e) { } catch (Exception e) {
// //
} }
return new ArrayList<>(zip_set); return new ArrayList<>(zip_set);
@ -291,12 +292,12 @@ public class System {
ArrayList<String> result = new ArrayList<>(); ArrayList<String> result = new ArrayList<>();
int random = 0; int random = 0;
for(Destination destination: this.all_destinations.values()){ for (Destination destination : this.all_destinations.values()) {
if(destination.getDistance_from_user()>150) if (destination.getDistance_from_user() > 150)
mem.add(destination); mem.add(destination);
} }
for (int i = 0; i < 3; i++){ for (int i = 0; i < 3; i++) {
random = (int) (Math.random() * mem.size()); random = (int) (Math.random() * mem.size());
result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown()); result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown());
} }
@ -309,12 +310,12 @@ public class System {
ArrayList<String> result = new ArrayList<>(); ArrayList<String> result = new ArrayList<>();
int random = 0; int random = 0;
for(Destination destination: this.all_destinations.values()){ for (Destination destination : this.all_destinations.values()) {
if(destination.getDistance_from_user()<100) if (destination.getDistance_from_user() < 100)
mem.add(destination); mem.add(destination);
} }
for (int i = 0; i < 3; i++){ for (int i = 0; i < 3; i++) {
random = (int) (Math.random() * mem.size()); random = (int) (Math.random() * mem.size());
result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown()); result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown());
} }
@ -322,13 +323,15 @@ public class System {
} }
public String[] destination_details(String destination_zip) { public String[] destination_details(String destination_zip) {
String[] result = new String[5]; String[] result = new String[7];
result[0] = distance(destination_zip); // Entfernung result[1] = weather_forecast(destination_zip)[0]; // Wettervorhersage für die nächsten 3 Tage
result[1] = travel_time(destination_zip)[0]; // Reisedauer Auto result[2] = weather_forecast(destination_zip)[1];
result[2] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad result[3] = weather_forecast(destination_zip)[2];
result[3] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto result[4] = distance(destination_zip); // Entfernung
result[4] = weather_forecast(destination_zip); // Wettervorhersage für die nächsten 3 Tage result[5] = travel_time(destination_zip)[0]; // Reisedauer Auto
result[6] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto
result[7] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad
return result; return result;
} }
@ -342,7 +345,8 @@ public class System {
HttpClient http_client = HttpClient.newHttpClient(); HttpClient http_client = HttpClient.newHttpClient();
HttpRequest get_request = HttpRequest.newBuilder() HttpRequest get_request = HttpRequest.newBuilder()
.uri(new URI("https://api.openweathermap.org/data/2.5/weather?zip=" + current_user.getZip() + ",de&appid=" + api_key + "&units=metric&lang=de")) .uri(new URI("https://api.openweathermap.org/data/2.5/weather?zip=" + current_user.getZip()
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
.GET() .GET()
.build(); .build();
@ -352,21 +356,22 @@ public class System {
weather = json.getJSONArray("weather").getJSONObject(0).getString("description"); weather = json.getJSONArray("weather").getJSONObject(0).getString("description");
temperature = json.getJSONObject("main").getDouble("temp"); temperature = json.getJSONObject("main").getDouble("temp");
} catch (Exception e) { } catch (Exception e) {
// //
} }
if (weather.equals("")) if (weather.equals(""))
return "Es ist ein Fehler aufgetreten!"; return "Es ist ein Fehler aufgetreten!";
else else
return weather + "\n" + temperature + "°C"; return weather + " " + temperature + "°C";
} }
public String weather_forecast(String destination_zip) { public String[] weather_forecast(String destination_zip) {
String weather_day_1 = ""; String weather_day_1 = "";
String weather_day_2 = ""; String weather_day_2 = "";
String weather_day_3 = ""; String weather_day_3 = "";
String[] result = new String[3];
double temperature_day_1_1 = 1; double temperature_day_1_1 = 1;
double temperature_day_1_2 = 1; double temperature_day_1_2 = 1;
@ -406,7 +411,8 @@ public class System {
HttpClient http_client = HttpClient.newHttpClient(); HttpClient http_client = HttpClient.newHttpClient();
HttpRequest get_request = HttpRequest.newBuilder() HttpRequest get_request = HttpRequest.newBuilder()
.uri(new URI("https://api.openweathermap.org/data/2.5/forecast?zip=" + destination_zip + ",de&appid=" + api_key + "&units=metric&lang=de")) .uri(new URI("https://api.openweathermap.org/data/2.5/forecast?zip=" + destination_zip
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
.GET() .GET()
.build(); .build();
@ -430,38 +436,38 @@ public class System {
int day3_4 = 0; int day3_4 = 0;
int day3_5 = 0; int day3_5 = 0;
for(int i = 0; i<40; i++){ for (int i = 0; i < 40; i++) {
if(json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")){ if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
day1_1 = i + 3; // 9 Uhr day1_1 = i + 3; // 9 Uhr
day1_2 = day1_1 + 1; // 12 Uhr day1_2 = day1_1 + 1; // 12 Uhr
day1_3 = day1_2 + 1; // 15 Uhr day1_3 = day1_2 + 1; // 15 Uhr
day1_4 = day1_3 + 1; // 18 Uhr day1_4 = day1_3 + 1; // 18 Uhr
day1_5 = day1_4 + 1; // 21 Uhr day1_5 = day1_4 + 1; // 21 Uhr
break; break;
} }
} }
for(int i = day1_5; i<40; i++){ for (int i = day1_5; i < 40; i++) {
if(json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")){ if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
day2_1 = i + 3; // 9 Uhr day2_1 = i + 3; // 9 Uhr
day2_2 = day2_1 + 1; // 12 Uhr day2_2 = day2_1 + 1; // 12 Uhr
day2_3 = day2_2 + 1; // 15 Uhr day2_3 = day2_2 + 1; // 15 Uhr
day2_4 = day2_3 + 1; // 18 Uhr day2_4 = day2_3 + 1; // 18 Uhr
day2_5 = day2_4 + 1; // 21 Uhr day2_5 = day2_4 + 1; // 21 Uhr
break; break;
} }
} }
for(int i = day2_5 + 1; i<40; i++){ for (int i = day2_5 + 1; i < 40; i++) {
if(json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")){ if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
day3_1 = i + 3; // 9 Uhr day3_1 = i + 3; // 9 Uhr
day3_2 = day3_1 + 1; // 12 Uhr day3_2 = day3_1 + 1; // 12 Uhr
day3_3 = day3_2 + 1; // 15 Uhr day3_3 = day3_2 + 1; // 15 Uhr
day3_4 = day3_3 + 1; // 18 Uhr day3_4 = day3_3 + 1; // 18 Uhr
day3_5 = day3_4 + 1; // 21 Uhr day3_5 = day3_4 + 1; // 21 Uhr
break; break;
} }
} }
@ -473,30 +479,48 @@ public class System {
day3date = json.getJSONArray("list").getJSONObject(day3_1).getString("dt_txt").split(" ")[0]; day3date = json.getJSONArray("list").getJSONObject(day3_1).getString("dt_txt").split(" ")[0];
day3date = day3date.split("-")[2] + "." + day3date.split("-")[1] + "." + day3date.split("-")[0]; day3date = day3date.split("-")[2] + "." + day3date.split("-")[1] + "." + day3date.split("-")[0];
weather_day_1 = json.getJSONArray("list").getJSONObject(day1_3).getJSONArray("weather").getJSONObject(0).getString("description"); weather_day_1 = json.getJSONArray("list").getJSONObject(day1_3).getJSONArray("weather").getJSONObject(0)
weather_day_2 = json.getJSONArray("list").getJSONObject(day2_3).getJSONArray("weather").getJSONObject(0).getString("description"); .getString("description");
weather_day_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONArray("weather").getJSONObject(0).getString("description"); weather_day_2 = json.getJSONArray("list").getJSONObject(day2_3).getJSONArray("weather").getJSONObject(0)
.getString("description");
weather_day_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONArray("weather").getJSONObject(0)
.getString("description");
temperature_day_1_1 = json.getJSONArray("list").getJSONObject(day1_1).getJSONObject("main").getDouble("temp"); temperature_day_1_1 = json.getJSONArray("list").getJSONObject(day1_1).getJSONObject("main")
temperature_day_1_2 = json.getJSONArray("list").getJSONObject(day1_2).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_1_3 = json.getJSONArray("list").getJSONObject(day1_3).getJSONObject("main").getDouble("temp"); temperature_day_1_2 = json.getJSONArray("list").getJSONObject(day1_2).getJSONObject("main")
temperature_day_1_4 = json.getJSONArray("list").getJSONObject(day1_4).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_1_5 = json.getJSONArray("list").getJSONObject(day1_5).getJSONObject("main").getDouble("temp"); temperature_day_1_3 = json.getJSONArray("list").getJSONObject(day1_3).getJSONObject("main")
.getDouble("temp");
temperature_day_1_4 = json.getJSONArray("list").getJSONObject(day1_4).getJSONObject("main")
.getDouble("temp");
temperature_day_1_5 = json.getJSONArray("list").getJSONObject(day1_5).getJSONObject("main")
.getDouble("temp");
temperature_day_2_1 = json.getJSONArray("list").getJSONObject(day2_1).getJSONObject("main").getDouble("temp"); temperature_day_2_1 = json.getJSONArray("list").getJSONObject(day2_1).getJSONObject("main")
temperature_day_2_2 = json.getJSONArray("list").getJSONObject(day2_2).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_2_3 = json.getJSONArray("list").getJSONObject(day2_3).getJSONObject("main").getDouble("temp"); temperature_day_2_2 = json.getJSONArray("list").getJSONObject(day2_2).getJSONObject("main")
temperature_day_2_4 = json.getJSONArray("list").getJSONObject(day2_4).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_2_5 = json.getJSONArray("list").getJSONObject(day2_5).getJSONObject("main").getDouble("temp"); temperature_day_2_3 = json.getJSONArray("list").getJSONObject(day2_3).getJSONObject("main")
.getDouble("temp");
temperature_day_2_4 = json.getJSONArray("list").getJSONObject(day2_4).getJSONObject("main")
.getDouble("temp");
temperature_day_2_5 = json.getJSONArray("list").getJSONObject(day2_5).getJSONObject("main")
.getDouble("temp");
temperature_day_3_1 = json.getJSONArray("list").getJSONObject(day3_1).getJSONObject("main").getDouble("temp"); temperature_day_3_1 = json.getJSONArray("list").getJSONObject(day3_1).getJSONObject("main")
temperature_day_3_2 = json.getJSONArray("list").getJSONObject(day3_2).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_3_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONObject("main").getDouble("temp"); temperature_day_3_2 = json.getJSONArray("list").getJSONObject(day3_2).getJSONObject("main")
temperature_day_3_4 = json.getJSONArray("list").getJSONObject(day3_4).getJSONObject("main").getDouble("temp"); .getDouble("temp");
temperature_day_3_5 = json.getJSONArray("list").getJSONObject(day3_5).getJSONObject("main").getDouble("temp"); temperature_day_3_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONObject("main")
.getDouble("temp");
temperature_day_3_4 = json.getJSONArray("list").getJSONObject(day3_4).getJSONObject("main")
.getDouble("temp");
temperature_day_3_5 = json.getJSONArray("list").getJSONObject(day3_5).getJSONObject("main")
.getDouble("temp");
} catch (Exception e) { } catch (Exception e) {
// //
} }
temperature_day_1.add(temperature_day_1_1); temperature_day_1.add(temperature_day_1_1);
@ -526,12 +550,20 @@ public class System {
temperature_day_3_high = (double) temperature_day_3.toArray()[temperature_day_2.size() - 1]; temperature_day_3_high = (double) temperature_day_3.toArray()[temperature_day_2.size() - 1];
temperature_day_3_low = (double) temperature_day_3.toArray()[0]; temperature_day_3_low = (double) temperature_day_3.toArray()[0];
if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals("")) if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals("")) {
return "Es ist ein Fehler aufgetreten!"; result[0] = "Es ist ein Fehler aufgetreten!";
else result[1] = "Es ist ein Fehler aufgetreten!";
return day1date + "\n" + weather_day_1 + "\nH: " + temperature_day_1_high + "°C" + " T: " + temperature_day_1_low + "°C\n\n" result[2] = "Es ist ein Fehler aufgetreten!";
+ day2date + "\n" + weather_day_2 + "\nH: " + temperature_day_2_high + "°C" + " T: " + temperature_day_2_low + "°C\n\n" } else {
+ day3date + "\n" + weather_day_3 + "\nH: " + temperature_day_3_high + "°C" + " T: " + temperature_day_3_low + "°C"; result[0] = day1date + ": " + weather_day_1 + " H: " + temperature_day_1_high + "°C" + " T: "
+ temperature_day_1_low + "°C";
result[1] = day2date + ": " + weather_day_2 + " H: " + temperature_day_2_high + "°C" + " T: "
+ temperature_day_2_low + "°C";
result[2] = day3date + ": " + weather_day_3 + " H: " + temperature_day_3_high + "°C" + " T: "
+ temperature_day_3_low + "°C";
}
return result;
} }
public boolean all_distances() { public boolean all_distances() {
@ -559,7 +591,7 @@ public class System {
} }
} }
} catch (Exception e) { } catch (Exception e) {
// //
} }
InputStream inputStream2 = System.class.getResourceAsStream("/zip.csv"); InputStream inputStream2 = System.class.getResourceAsStream("/zip.csv");
@ -578,23 +610,26 @@ public class System {
dLat = lat2 - lat1; dLat = lat2 - lat1;
dLon = lon2 - lon1; dLon = lon2 - lon1;
a = Math.pow(Math.sin(Math.toRadians(dLat / 2.0)), 2) + Math.pow(Math.sin(Math.toRadians(dLon / 2.0)), 2) * Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)); a = Math.pow(Math.sin(Math.toRadians(dLat / 2.0)), 2)
+ Math.pow(Math.sin(Math.toRadians(dLon / 2.0)), 2) * Math.cos(Math.toRadians(lat1))
* Math.cos(Math.toRadians(lat2));
distance = 6378.388 * 2.0 * Math.atan2(Math.sqrt(a), Math.sqrt(1.0 - a)); distance = 6378.388 * 2.0 * Math.atan2(Math.sqrt(a), Math.sqrt(1.0 - a));
result = Math.round(distance * 1.25 * 1000) / 1000.0; result = Math.round(distance * 1.25 * 100) / 100.0;
this.all_destinations.put(line.split(";")[0],new Destination(line.split(";")[1],line.split(";")[0], result)); this.all_destinations.put(line.split(";")[0],
new Destination(line.split(";")[1], line.split(";")[0], result));
} }
} catch (Exception e) { } catch (Exception e) {
// //
} }
return true; return true;
} }
public String distance(String destination_zip){ public String distance(String destination_zip) {
return "" + this.all_destinations.get(destination_zip).getDistance_from_user() + " km"; return "" + this.all_destinations.get(destination_zip).getDistance_from_user() + " km";
@ -604,16 +639,27 @@ public class System {
String[] result = new String[2]; String[] result = new String[2];
result[0] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getCar_avg_kmh() * 1000) / 1000.0) + " h"; if (current_user.getCar_avg_kmh() == 0)
result[1] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getBike_avg_kmh() * 1000) / 1000.0) + " h"; result[0] = "";
else
result[0] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
/ current_user.getCar_avg_kmh() * 100) / 100.0) + " h";
if (current_user.getBike_avg_kmh() == 0)
result[1] = "";
else
result[1] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
/ current_user.getBike_avg_kmh() * 100) / 100.0) + " h";
return result; return result;
} }
public String calc_l_consumption(String destination_zip) { public String calc_l_consumption(String destination_zip) {
return "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) * current_user.getCar_l_100km() / 100.0 * 1000) / 1000.0) + " l"; if (current_user.getCar_l_100km() == 0)
return "";
return "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
* current_user.getCar_l_100km() / 100.0 * 100) / 100.0) + " l";
} }
} }

107
src/test/java/de/hs_mannheim/domain/SystemTest.java
View File

@ -12,23 +12,23 @@ public class SystemTest {
System current_system = new System("35a75437476f12302f72e55d368485db"); System current_system = new System("35a75437476f12302f72e55d368485db");
@Test @Test
public void weather_forecast(){ public void weather_forecast() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
assertNotEquals("Es ist ein Fehler aufgetreten!",current_system.weather_forecast("68161")); assertNotEquals("Es ist ein Fehler aufgetreten!", current_system.weather_forecast("68161")[0]);
} }
@Test @Test
public void current_weather(){ public void current_weather() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
assertNotEquals("Es ist ein Fehler aufgetreten!",current_system.current_weather()); assertNotEquals("Es ist ein Fehler aufgetreten!", current_system.current_weather());
} }
@Test @Test
public void search(){ public void search() {
ArrayList<String> list = current_system.search("Mannheim"); ArrayList<String> list = current_system.search("Mannheim");
@ -38,69 +38,73 @@ public class SystemTest {
} }
@Test @Test
public void distance(){ public void distance() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
assertEquals("88.46 km", current_system.distance("60306")); // Frankfurt assertEquals("88.46 km", current_system.distance("60306")); // Frankfurt
assertEquals("581.109 km", current_system.distance("20095")); // Hamburg assertEquals("581.11 km", current_system.distance("20095")); // Hamburg
assertEquals("603.608 km", current_system.distance("10115")); // Berlin assertEquals("603.61 km", current_system.distance("10115")); // Berlin
} }
@Test @Test
public void travel_time(){ public void travel_time() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
assertEquals("0.885 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto assertEquals("0.88 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto
assertEquals("4.423 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad assertEquals("4.42 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad
assertEquals("6.036 h", current_system.travel_time("10115")[0]); // Berlin mit Auto assertEquals("6.04 h", current_system.travel_time("10115")[0]); // Berlin mit Auto
assertEquals("30.18 h", current_system.travel_time("10115")[1]); // Berlin mit Fahrrad assertEquals("30.18 h", current_system.travel_time("10115")[1]); // Berlin mit Fahrrad
} }
@Test @Test
public void calc_l_consumption(){ public void calc_l_consumption() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
assertEquals("8.846 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt assertEquals("8.85 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt
assertEquals("58.111 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg assertEquals("58.11 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg
assertEquals("60.361 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin assertEquals("60.36 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin
} }
@Test @Test
public void random_destinations(){ public void random_destinations() {
current_system.sign_in_user("David","123Esel"); current_system.sign_in_user("David", "123Esel");
ArrayList<String> random_destination_car = current_system.random_destinations_car(); ArrayList<String> random_destination_car = current_system.random_destinations_car();
ArrayList<String> random_destination_bike = current_system.random_destinations_bike(); ArrayList<String> random_destination_bike = current_system.random_destinations_bike();
assertEquals(3, random_destination_car.size()); // random_destinations_car gibt genau 3 destinations zurück assertEquals(3, random_destination_car.size()); // random_destinations_car gibt genau 3 destinations zurück
assertEquals(3, random_destination_bike.size()); // random destinations_bike gibt genau 3 destinations zurück assertEquals(3, random_destination_bike.size()); // random destinations_bike gibt genau 3 destinations zurück
// random_destinations_car gibt nur destinations mit mindestens 150 km Entfernung zurück // random_destinations_car gibt nur destinations mit mindestens 150 km
assertEquals(true, Double.parseDouble(current_system.distance(random_destination_car.get(0).split(";")[0]).replace(" km", "")) > 150); // Entfernung zurück
// random_destinations_bike gibt nur destinations mit maximal 100 km Entfernung zurück assertEquals(true, Double.parseDouble(
assertEquals(true, Double.parseDouble(current_system.distance(random_destination_bike.get(0).split(";")[0]).replace(" km", "")) < 100); current_system.distance(random_destination_car.get(0).split(";")[0]).replace(" km", "")) > 150);
// random_destinations_bike gibt nur destinations mit maximal 100 km Entfernung
// zurück
assertEquals(true, Double.parseDouble(
current_system.distance(random_destination_bike.get(0).split(";")[0]).replace(" km", "")) < 100);
} }
@Test @Test
public void encoding(){ public void encoding() {
String test_password = "123Esel"; String test_password = "123Esel";
assertEquals("MTIzRXNlbA==",System.encoding(test_password)); assertEquals("MTIzRXNlbA==", System.encoding(test_password));
} }
@Test @Test
public void decoding(){ public void decoding() {
String test_password = "MTIzRXNlbA=="; String test_password = "MTIzRXNlbA==";
assertEquals("123Esel",System.decoding(test_password)); assertEquals("123Esel", System.decoding(test_password));
} }
@ -108,7 +112,7 @@ public class SystemTest {
public void sign_in_user() { public void sign_in_user() {
assertEquals(true, current_system.sign_in_user("Daniel", "1401Daniel")); assertEquals(true, current_system.sign_in_user("Daniel", "1401Daniel"));
assertEquals("Daniel",current_system.getDetails()[0]); assertEquals("Daniel", current_system.getDetails()[0]);
} }
@ -116,29 +120,33 @@ public class SystemTest {
public void sign_out_user() { public void sign_out_user() {
assertEquals(true, current_system.sign_in_user("David", "123Esel")); assertEquals(true, current_system.sign_in_user("David", "123Esel"));
assertEquals("David",current_system.getDetails()[0]); assertEquals("David", current_system.getDetails()[0]);
current_system.sign_out_user(); current_system.sign_out_user();
assertEquals("",current_system.getDetails()[0]); assertEquals("", current_system.getDetails()[0]);
} }
@Test @Test
public void sign_up_user(){ public void sign_up_user() {
// Username darf nicht doppelt vorkommen! // Username darf nicht doppelt vorkommen!
assertEquals(false, current_system.sign_up_user("David","123Esel","123Esel","Mannheim","68161","AMG","10","300","20")); assertEquals(false, current_system.sign_up_user("David", "123Esel", "123Esel", "Mannheim", "68161", "AMG", "10",
assertEquals(true, current_system.sign_up_user("Selim","Penis69","Penis69","Mannheim","68161","AMG","10","300","20")); "300", "20"));
assertEquals(true, current_system.sign_up_user("Selim", "Penis69", "Penis69", "Mannheim", "68161", "AMG", "10",
"300", "20"));
// PLZ muss mit Stadt übereinstimmen // PLZ muss mit Stadt übereinstimmen
assertEquals(false, current_system.sign_up_user("Lukas","123Esel","123Esel","Mannheim","11105","AMG","10","300","20")); assertEquals(false, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "11105", "AMG", "10",
assertEquals(true, current_system.sign_up_user("Lukas","123Esel","123Esel","Mannheim","68305","AMG","10","300","20")); "300", "20"));
assertEquals(true, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "68305", "AMG", "10",
"300", "20"));
assertEquals("Lukas",current_system.getDetails()[0]); assertEquals("Lukas", current_system.getDetails()[0]);
current_system.sign_out_user(); current_system.sign_out_user();
assertEquals("",current_system.getDetails()[0]); assertEquals("", current_system.getDetails()[0]);
assertEquals(true, current_system.sign_in_user("Lukas","123Esel")); assertEquals(true, current_system.sign_in_user("Lukas", "123Esel"));
} }
@Test @Test
public void change_user_details(){ public void change_user_details() {
current_system.sign_in_user("David", "123Esel"); current_system.sign_in_user("David", "123Esel");
current_system.change_user_details("Enes", "123Esel", "Mannheim", "68161", "", "", "", ""); current_system.change_user_details("Enes", "123Esel", "Mannheim", "68161", "", "", "", "");
@ -148,7 +156,7 @@ public class SystemTest {
} }
@Test @Test
public void change_user_password(){ public void change_user_password() {
current_system.sign_in_user("David", "123Esel"); current_system.sign_in_user("David", "123Esel");
assertEquals(true, current_system.change_user_password("123Esel", "Pizza69", "Pizza69")); assertEquals(true, current_system.change_user_password("123Esel", "Pizza69", "Pizza69"));
@ -159,11 +167,10 @@ public class SystemTest {
; ;
} }
/* /*
Tests auf Basis von user_data.csv: * Tests auf Basis von user_data.csv:
Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2 * Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0 * David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0
*/ */
} }