Compare commits
No commits in common. "main" and "minor_adjustments" have entirely different histories.
main
...
minor_adju
|
|
@ -1,3 +0,0 @@
|
|||
Selim Eser 2211482: Selim Eser, Selim
|
||||
David Groys 3012642: David Groys
|
||||
Daniel Zdravkovic 3012893: Daniel Zdravkovic
|
||||
|
|
@ -43,8 +43,8 @@ public class System {
|
|||
|
||||
public static String decoding(String string) {
|
||||
byte[] binary_data = new byte[string.length()];
|
||||
for (int i = 0; i < string.length(); i++) {
|
||||
binary_data[i] = (byte) string.charAt(i);
|
||||
for(int i = 0; i < string.length(); i++) {
|
||||
binary_data[i] = (byte)string.charAt(i);
|
||||
}
|
||||
return new String(Base64.decodeBase64(binary_data));
|
||||
}
|
||||
|
|
@ -58,7 +58,7 @@ public class System {
|
|||
}
|
||||
|
||||
public static double parseDouble(String s) throws NumberFormatException {
|
||||
if (s.equals(""))
|
||||
if(s.equals(""))
|
||||
return 0;
|
||||
else
|
||||
return Double.parseDouble(s);
|
||||
|
|
@ -85,11 +85,11 @@ public class System {
|
|||
}
|
||||
}
|
||||
|
||||
public ArrayList<String> all_user_toString() {
|
||||
public ArrayList<String> all_user_toString(){
|
||||
|
||||
ArrayList<String> result = new ArrayList<>();
|
||||
|
||||
for (User user : this.all_user) {
|
||||
for(User user : this.all_user){
|
||||
result.add(user.toString());
|
||||
}
|
||||
|
||||
|
|
@ -111,42 +111,41 @@ public class System {
|
|||
return false;
|
||||
}
|
||||
|
||||
public boolean sign_up_user(String username, String password, String password_authentication, String hometown,
|
||||
String zip,
|
||||
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS) {
|
||||
public boolean sign_up_user(String username, String password, String password_authentication, String hometown, String zip,
|
||||
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS){
|
||||
|
||||
double car_l_100km;
|
||||
double car_avg_kmh;
|
||||
double bike_avg_kmh;
|
||||
|
||||
try {
|
||||
try{
|
||||
car_l_100km = parseDouble(car_l_100kmS);
|
||||
car_avg_kmh = parseDouble(car_avg_kmhS);
|
||||
bike_avg_kmh = parseDouble(bike_avg_kmhS);
|
||||
} catch (NumberFormatException n) {
|
||||
} catch (NumberFormatException n){
|
||||
return false;
|
||||
}
|
||||
|
||||
if (username.equals("") || password.equals("") || hometown.equals("") || zip.equals(""))
|
||||
if(username.equals("")||password.equals("")||hometown.equals("")||zip.equals(""))
|
||||
return false;
|
||||
|
||||
if (!password.equals(password_authentication))
|
||||
if(!password.equals(password_authentication))
|
||||
return false;
|
||||
|
||||
for (User user : this.all_user)
|
||||
if (user.getUsername().equals(username))
|
||||
for(User user: this.all_user)
|
||||
if(user.getUsername().equals(username))
|
||||
return false;
|
||||
|
||||
ArrayList<String> mem = search(zip);
|
||||
boolean bool = false;
|
||||
|
||||
for (String line : mem)
|
||||
if (line.split(";")[1].equals(hometown)) {
|
||||
for (String line: mem)
|
||||
if(line.split(";")[1].equals(hometown)) {
|
||||
bool = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!bool)
|
||||
if(!bool)
|
||||
return false;
|
||||
|
||||
current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh, bike_avg_kmh);
|
||||
|
|
@ -161,53 +160,51 @@ public class System {
|
|||
}
|
||||
|
||||
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_avg_kmh;
|
||||
double bike_avg_kmh;
|
||||
|
||||
try {
|
||||
try{
|
||||
car_l_100km = parseDouble(car_l_100kmS);
|
||||
car_avg_kmh = parseDouble(car_avg_kmhS);
|
||||
bike_avg_kmh = parseDouble(bike_avg_kmhS);
|
||||
} catch (NumberFormatException n) {
|
||||
} catch (NumberFormatException n){
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!current_user.getPassword().equals(password))
|
||||
if(!current_user.getPassword().equals(password))
|
||||
return false;
|
||||
|
||||
if (username.equals("") || hometown.equals("") || zip.equals(""))
|
||||
if(username.equals("")||hometown.equals("")||zip.equals(""))
|
||||
return false;
|
||||
|
||||
if (!current_user.getUsername().equals(username)) {
|
||||
for (User user : this.all_user)
|
||||
if (user.getUsername().equals(username))
|
||||
for(User user: this.all_user)
|
||||
if(user.getUsername().equals(username))
|
||||
return false;
|
||||
}
|
||||
|
||||
ArrayList<String> mem = search(zip);
|
||||
boolean bool = false;
|
||||
|
||||
for (String line : mem)
|
||||
if (line.split(";")[1].equals(hometown)) {
|
||||
for (String line: mem)
|
||||
if(line.split(";")[1].equals(hometown)) {
|
||||
bool = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!bool)
|
||||
if(!bool)
|
||||
return false;
|
||||
|
||||
for (int i = 0; i < this.all_user.size(); i++)
|
||||
if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
|
||||
|
||||
for(int i = 0; i< this.all_user.size(); i++)
|
||||
if(this.all_user.get(i).getUsername().equals(current_user.getUsername()))
|
||||
this.all_user.remove(i);
|
||||
|
||||
write_to_file(all_user_toString(), "src/main/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);
|
||||
|
||||
write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
|
||||
|
|
@ -218,18 +215,15 @@ public class System {
|
|||
|
||||
}
|
||||
|
||||
public boolean change_user_password(String old_password, String new_password, String new_password_authentication) {
|
||||
if (!this.current_user.getPassword().equals(old_password))
|
||||
public boolean change_user_password(String old_password, String new_password, String new_password_authentication){
|
||||
if(!this.current_user.getPassword().equals(old_password))
|
||||
return false;
|
||||
|
||||
if (!new_password.equals(new_password_authentication))
|
||||
if(!new_password.equals(new_password_authentication))
|
||||
return false;
|
||||
|
||||
if(old_password.equals(new_password))
|
||||
return false;
|
||||
|
||||
for (int i = 0; i < this.all_user.size(); i++)
|
||||
if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
|
||||
for(int i = 0; i< this.all_user.size(); i++)
|
||||
if(this.all_user.get(i).getUsername().equals(current_user.getUsername()))
|
||||
this.all_user.remove(i);
|
||||
|
||||
write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
|
||||
|
|
@ -261,12 +255,12 @@ public class System {
|
|||
current_user = new User();
|
||||
}
|
||||
|
||||
public String[] getDetails() {
|
||||
return new String[] { current_user.getUsername(), current_user.getHometown(),
|
||||
public String[] getDetails(){
|
||||
return new String[]{current_user.getUsername(), current_user.getHometown(),
|
||||
current_user.getZip(), current_user.getCar_name(),
|
||||
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.getBike_avg_kmh() == 0 ? "" : String.valueOf(current_user.getBike_avg_kmh()) };
|
||||
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.getBike_avg_kmh()==0?"":String.valueOf(current_user.getBike_avg_kmh())};
|
||||
}
|
||||
|
||||
public ArrayList<String> search(String hometown_or_zip) {
|
||||
|
|
@ -279,8 +273,7 @@ public class System {
|
|||
String line;
|
||||
while ((line = reader.readLine()) != null && zip_set.size() < 200) {
|
||||
line = line.replace("\"", "");
|
||||
if (line.split(";")[0].toUpperCase().startsWith(hometown_or_zip.toUpperCase())
|
||||
|| line.split(";")[1].toUpperCase().startsWith(hometown_or_zip.toUpperCase()))
|
||||
if (line.split(";")[0].contains(hometown_or_zip)||line.split(";")[1].contains(hometown_or_zip))
|
||||
zip_set.add(line);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
|
@ -296,12 +289,12 @@ public class System {
|
|||
ArrayList<String> result = new ArrayList<>();
|
||||
int random = 0;
|
||||
|
||||
for (Destination destination : this.all_destinations.values()) {
|
||||
if (destination.getDistance_from_user() > 150)
|
||||
for(Destination destination: this.all_destinations.values()){
|
||||
if(destination.getDistance_from_user()>150)
|
||||
mem.add(destination);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
for (int i = 0; i < 3; i++){
|
||||
random = (int) (Math.random() * mem.size());
|
||||
result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown());
|
||||
}
|
||||
|
|
@ -314,12 +307,12 @@ public class System {
|
|||
ArrayList<String> result = new ArrayList<>();
|
||||
int random = 0;
|
||||
|
||||
for (Destination destination : this.all_destinations.values()) {
|
||||
if (destination.getDistance_from_user() < 100)
|
||||
for(Destination destination: this.all_destinations.values()){
|
||||
if(destination.getDistance_from_user()<100)
|
||||
mem.add(destination);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
for (int i = 0; i < 3; i++){
|
||||
random = (int) (Math.random() * mem.size());
|
||||
result.add(mem.get(random).getZip() + ";" + mem.get(random).getTown());
|
||||
}
|
||||
|
|
@ -327,15 +320,13 @@ public class System {
|
|||
}
|
||||
|
||||
public String[] destination_details(String destination_zip) {
|
||||
String[] result = new String[7];
|
||||
String[] result = new String[5];
|
||||
|
||||
result[0] = weather_forecast(destination_zip)[0]; // Wettervorhersage für die nächsten 3 Tage
|
||||
result[1] = weather_forecast(destination_zip)[1];
|
||||
result[2] = weather_forecast(destination_zip)[2];
|
||||
result[3] = distance(destination_zip); // Entfernung
|
||||
result[4] = travel_time(destination_zip)[0]; // Reisedauer Auto
|
||||
result[5] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto
|
||||
result[6] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad
|
||||
result[0] = distance(destination_zip); // Entfernung
|
||||
result[1] = travel_time(destination_zip)[0]; // Reisedauer Auto
|
||||
result[2] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad
|
||||
result[3] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto
|
||||
result[4] = weather_forecast(destination_zip); // Wettervorhersage für die nächsten 3 Tage
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -347,27 +338,15 @@ public class System {
|
|||
|
||||
try {
|
||||
HttpClient http_client = HttpClient.newHttpClient();
|
||||
HttpRequest get_request;
|
||||
|
||||
if(current_user.getZip().length()<5){
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/weather?q=" + current_user.getHometown()
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
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"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
else{
|
||||
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"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
|
||||
|
||||
JSONObject json = new JSONObject(get_response.body());
|
||||
JSONObject json = new JSONObject(((String) get_response.body()).substring(0, ((String) get_response.body()).length()));
|
||||
weather = json.getJSONArray("weather").getJSONObject(0).getString("description");
|
||||
temperature = json.getJSONObject("main").getDouble("temp");
|
||||
} catch (Exception e) {
|
||||
|
|
@ -377,22 +356,20 @@ public class System {
|
|||
if (weather.equals(""))
|
||||
return "Es ist ein Fehler aufgetreten!";
|
||||
else
|
||||
return weather + " " + 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_2 = "";
|
||||
String weather_day_3 = "";
|
||||
String[] result = new String[3];
|
||||
|
||||
double temperature_day_1_1 = 1;
|
||||
double temperature_day_1_2 = 1;
|
||||
double temperature_day_1_3 = 1;
|
||||
double temperature_day_1_4 = 1;
|
||||
double temperature_day_1_5 = 1;
|
||||
|
||||
TreeSet<Double> temperature_day_1 = new TreeSet<>();
|
||||
double temperature_day_1_high = 1;
|
||||
|
|
@ -402,7 +379,6 @@ public class System {
|
|||
double temperature_day_2_2 = 1;
|
||||
double temperature_day_2_3 = 1;
|
||||
double temperature_day_2_4 = 1;
|
||||
double temperature_day_2_5 = 1;
|
||||
|
||||
TreeSet<Double> temperature_day_2 = new TreeSet<>();
|
||||
double temperature_day_2_high = 1;
|
||||
|
|
@ -412,137 +388,41 @@ public class System {
|
|||
double temperature_day_3_2 = 1;
|
||||
double temperature_day_3_3 = 1;
|
||||
double temperature_day_3_4 = 1;
|
||||
double temperature_day_3_5 = 1;
|
||||
|
||||
TreeSet<Double> temperature_day_3 = new TreeSet<>();
|
||||
double temperature_day_3_high = 1;
|
||||
double temperature_day_3_low = 1;
|
||||
|
||||
String day1date = "";
|
||||
String day2date = "";
|
||||
String day3date = "";
|
||||
|
||||
try {
|
||||
HttpClient http_client = HttpClient.newHttpClient();
|
||||
HttpRequest get_request;
|
||||
|
||||
if(destination_zip.length()<5){
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/forecast?q=" + search(destination_zip).get(0).split(";")[1]
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
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"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
else{
|
||||
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"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
|
||||
|
||||
JSONObject json = new JSONObject(get_response.body());
|
||||
JSONObject json = new JSONObject(((String) get_response.body()).substring(0, ((String) get_response.body()).length()));
|
||||
weather_day_1 = json.getJSONArray("list").getJSONObject(11).getJSONArray("weather").getJSONObject(0).getString("description");
|
||||
weather_day_2 = json.getJSONArray("list").getJSONObject(19).getJSONArray("weather").getJSONObject(0).getString("description");
|
||||
weather_day_3 = json.getJSONArray("list").getJSONObject(27).getJSONArray("weather").getJSONObject(0).getString("description");
|
||||
|
||||
int day1_1 = 0;
|
||||
int day1_2 = 0;
|
||||
int day1_3 = 0;
|
||||
int day1_4 = 0;
|
||||
int day1_5 = 0;
|
||||
int day2_1 = 0;
|
||||
int day2_2 = 0;
|
||||
int day2_3 = 0;
|
||||
int day2_4 = 0;
|
||||
int day2_5 = 0;
|
||||
int day3_1 = 0;
|
||||
int day3_2 = 0;
|
||||
int day3_3 = 0;
|
||||
int day3_4 = 0;
|
||||
int day3_5 = 0;
|
||||
temperature_day_1_1 = json.getJSONArray("list").getJSONObject(8).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_1_2 = json.getJSONArray("list").getJSONObject(10).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_1_3 = json.getJSONArray("list").getJSONObject(12).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_1_4 = json.getJSONArray("list").getJSONObject(14).getJSONObject("main").getDouble("temp");
|
||||
|
||||
for (int i = 0; i < 40; i++) {
|
||||
temperature_day_2_1 = json.getJSONArray("list").getJSONObject(16).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_2_2 = json.getJSONArray("list").getJSONObject(18).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_2_3 = json.getJSONArray("list").getJSONObject(20).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_2_4 = json.getJSONArray("list").getJSONObject(22).getJSONObject("main").getDouble("temp");
|
||||
|
||||
if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
|
||||
day1_1 = i + 3; // 9 Uhr
|
||||
day1_2 = day1_1 + 1; // 12 Uhr
|
||||
day1_3 = day1_2 + 1; // 15 Uhr
|
||||
day1_4 = day1_3 + 1; // 18 Uhr
|
||||
day1_5 = day1_4 + 1; // 21 Uhr
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = day1_5; i < 40; i++) {
|
||||
|
||||
if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
|
||||
day2_1 = i + 3; // 9 Uhr
|
||||
day2_2 = day2_1 + 1; // 12 Uhr
|
||||
day2_3 = day2_2 + 1; // 15 Uhr
|
||||
day2_4 = day2_3 + 1; // 18 Uhr
|
||||
day2_5 = day2_4 + 1; // 21 Uhr
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = day2_5 + 1; i < 40; i++) {
|
||||
|
||||
if (json.getJSONArray("list").getJSONObject(i).getString("dt_txt").split(" ")[1].startsWith("00")) {
|
||||
day3_1 = i + 3; // 9 Uhr
|
||||
day3_2 = day3_1 + 1; // 12 Uhr
|
||||
day3_3 = day3_2 + 1; // 15 Uhr
|
||||
day3_4 = day3_3 + 1; // 18 Uhr
|
||||
day3_5 = day3_4 + 1; // 21 Uhr
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
day1date = json.getJSONArray("list").getJSONObject(day1_1).getString("dt_txt").split(" ")[0];
|
||||
day1date = day1date.split("-")[2] + "." + day1date.split("-")[1] + "." + day1date.split("-")[0];
|
||||
day2date = json.getJSONArray("list").getJSONObject(day2_1).getString("dt_txt").split(" ")[0];
|
||||
day2date = day2date.split("-")[2] + "." + day2date.split("-")[1] + "." + day2date.split("-")[0];
|
||||
day3date = json.getJSONArray("list").getJSONObject(day3_1).getString("dt_txt").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_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_2 = json.getJSONArray("list").getJSONObject(day1_2).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_2 = json.getJSONArray("list").getJSONObject(day2_2).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_2 = json.getJSONArray("list").getJSONObject(day3_2).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");
|
||||
temperature_day_3_1 = json.getJSONArray("list").getJSONObject(24).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_3_2 = json.getJSONArray("list").getJSONObject(26).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_3_3 = json.getJSONArray("list").getJSONObject(28).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_3_4 = json.getJSONArray("list").getJSONObject(30).getJSONObject("main").getDouble("temp");
|
||||
|
||||
} catch (Exception e) {
|
||||
//
|
||||
|
|
@ -552,7 +432,6 @@ public class System {
|
|||
temperature_day_1.add(temperature_day_1_2);
|
||||
temperature_day_1.add(temperature_day_1_3);
|
||||
temperature_day_1.add(temperature_day_1_4);
|
||||
temperature_day_1.add(temperature_day_1_5);
|
||||
|
||||
temperature_day_1_high = (double) temperature_day_1.toArray()[temperature_day_1.size() - 1];
|
||||
temperature_day_1_low = (double) temperature_day_1.toArray()[0];
|
||||
|
|
@ -561,34 +440,24 @@ public class System {
|
|||
temperature_day_2.add(temperature_day_2_2);
|
||||
temperature_day_2.add(temperature_day_2_3);
|
||||
temperature_day_2.add(temperature_day_2_4);
|
||||
temperature_day_2.add(temperature_day_2_5);
|
||||
|
||||
temperature_day_2_high = (double) temperature_day_2.toArray()[temperature_day_2.size() - 1];
|
||||
temperature_day_2_high = (double) temperature_day_2.toArray()[temperature_day_1.size() - 1];
|
||||
temperature_day_2_low = (double) temperature_day_2.toArray()[0];
|
||||
|
||||
temperature_day_3.add(temperature_day_3_1);
|
||||
temperature_day_3.add(temperature_day_3_2);
|
||||
temperature_day_3.add(temperature_day_3_3);
|
||||
temperature_day_3.add(temperature_day_3_4);
|
||||
temperature_day_3.add(temperature_day_3_5);
|
||||
|
||||
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_1.size() - 1];
|
||||
temperature_day_3_low = (double) temperature_day_3.toArray()[0];
|
||||
|
||||
if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals("")) {
|
||||
result[0] = "Es ist ein Fehler aufgetreten!";
|
||||
result[1] = "Es ist ein Fehler aufgetreten!";
|
||||
result[2] = "Es ist ein Fehler aufgetreten!";
|
||||
} else {
|
||||
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;
|
||||
if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals(""))
|
||||
return "Es ist ein Fehler aufgetreten!";
|
||||
else
|
||||
return "Morgen: " + weather_day_1 + ": Minimum: " + temperature_day_1_low + " °C" + "; Maximum: " + temperature_day_1_high + " °C\n"
|
||||
+ "Übermorgen: " + weather_day_2 + ": Minimum: " + temperature_day_2_low + " °C" + "; Maximum: " + temperature_day_2_high + " °C\n"
|
||||
+ "Überübermorgen: " + weather_day_3 + ": Minimum: " + temperature_day_3_low + " °C" + "; Maximum: " + temperature_day_3_high + " °C";
|
||||
}
|
||||
|
||||
public boolean all_distances() {
|
||||
|
|
@ -635,16 +504,13 @@ public class System {
|
|||
dLat = lat2 - lat1;
|
||||
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));
|
||||
|
||||
result = Math.round(distance * 1.25 * 100) / 100.0;
|
||||
result = Math.round(distance * 1.25 * 1000) / 1000.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) {
|
||||
|
|
@ -654,7 +520,7 @@ public class System {
|
|||
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";
|
||||
|
||||
|
|
@ -664,27 +530,16 @@ public class System {
|
|||
|
||||
String[] result = new String[2];
|
||||
|
||||
if (current_user.getCar_avg_kmh() == 0)
|
||||
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";
|
||||
result[0] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getCar_avg_kmh() * 1000) / 1000.0) + " h";
|
||||
result[1] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getBike_avg_kmh() * 1000) / 1000.0) + " h";
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public String calc_l_consumption(String destination_zip) {
|
||||
|
||||
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";
|
||||
return "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) * current_user.getCar_l_100km() / 100.0 * 1000) / 1000.0) + " l";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
|
|
@ -12,23 +12,21 @@ public class SystemTest {
|
|||
System current_system = new System("35a75437476f12302f72e55d368485db");
|
||||
|
||||
@Test
|
||||
public void weather_forecast() {
|
||||
public void weather_forecast(){
|
||||
|
||||
current_system.sign_in_user("David", "123Esel");
|
||||
|
||||
assertNotEquals("Es ist ein Fehler aufgetreten!", current_system.weather_forecast("68161")[0]);
|
||||
assertNotEquals("Es ist ein Fehler aufgetreten!",current_system.weather_forecast("68161"));
|
||||
}
|
||||
|
||||
@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
|
||||
public void search() {
|
||||
public void search(){
|
||||
|
||||
ArrayList<String> list = current_system.search("Mannheim");
|
||||
|
||||
|
|
@ -38,73 +36,69 @@ public class SystemTest {
|
|||
}
|
||||
|
||||
@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("581.11 km", current_system.distance("20095")); // Hamburg
|
||||
assertEquals("603.61 km", current_system.distance("10115")); // Berlin
|
||||
assertEquals("581.109 km", current_system.distance("20095")); // Hamburg
|
||||
assertEquals("603.608 km", current_system.distance("10115")); // Berlin
|
||||
|
||||
}
|
||||
|
||||
@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.88 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto
|
||||
assertEquals("4.42 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad
|
||||
assertEquals("0.885 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto
|
||||
assertEquals("4.423 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad
|
||||
|
||||
assertEquals("6.04 h", current_system.travel_time("10115")[0]); // Berlin mit Auto
|
||||
assertEquals("6.036 h", current_system.travel_time("10115")[0]); // Berlin mit Auto
|
||||
assertEquals("30.18 h", current_system.travel_time("10115")[1]); // Berlin mit Fahrrad
|
||||
}
|
||||
|
||||
@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.85 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt
|
||||
assertEquals("58.11 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg
|
||||
assertEquals("60.36 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin
|
||||
assertEquals("8.846 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt
|
||||
assertEquals("58.111 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg
|
||||
assertEquals("60.361 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin
|
||||
}
|
||||
|
||||
@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_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_bike.size()); // random destinations_bike gibt genau 3 destinations zurück
|
||||
|
||||
// random_destinations_car gibt nur destinations mit mindestens 150 km
|
||||
// Entfernung zurück
|
||||
assertEquals(true, Double.parseDouble(
|
||||
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);
|
||||
// random_destinations_car gibt nur destinations mit mindestens 150 km Entfernung zurück
|
||||
assertEquals(true, Double.parseDouble(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
|
||||
public void encoding() {
|
||||
public void encoding(){
|
||||
|
||||
String test_password = "123Esel";
|
||||
|
||||
assertEquals("MTIzRXNlbA==", System.encoding(test_password));
|
||||
assertEquals("MTIzRXNlbA==",System.encoding(test_password));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void decoding() {
|
||||
public void decoding(){
|
||||
|
||||
String test_password = "MTIzRXNlbA==";
|
||||
|
||||
assertEquals("123Esel", System.decoding(test_password));
|
||||
assertEquals("123Esel",System.decoding(test_password));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -112,7 +106,7 @@ public class SystemTest {
|
|||
public void sign_in_user() {
|
||||
|
||||
assertEquals(true, current_system.sign_in_user("Daniel", "1401Daniel"));
|
||||
assertEquals("Daniel", current_system.getDetails()[0]);
|
||||
assertEquals("Daniel",current_system.getDetails()[0]);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -120,33 +114,29 @@ public class SystemTest {
|
|||
public void sign_out_user() {
|
||||
|
||||
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();
|
||||
assertEquals("", current_system.getDetails()[0]);
|
||||
assertEquals("",current_system.getDetails()[0]);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sign_up_user() {
|
||||
public void sign_up_user(){
|
||||
// Username darf nicht doppelt vorkommen!
|
||||
assertEquals(false, current_system.sign_up_user("David", "123Esel", "123Esel", "Mannheim", "68161", "AMG", "10",
|
||||
"300", "20"));
|
||||
assertEquals(true, current_system.sign_up_user("Selim", "Penis69", "Penis69", "Mannheim", "68161", "AMG", "10",
|
||||
"300", "20"));
|
||||
assertEquals(false, current_system.sign_up_user("David","123Esel","123Esel","Mannheim","68161","AMG","10","300","20"));
|
||||
assertEquals(true, current_system.sign_up_user("Selim","Penis69","Penis69","Mannheim","68161","AMG","10","300","20"));
|
||||
// PLZ muss mit Stadt übereinstimmen
|
||||
assertEquals(false, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "11105", "AMG", "10",
|
||||
"300", "20"));
|
||||
assertEquals(true, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "68305", "AMG", "10",
|
||||
"300", "20"));
|
||||
assertEquals(false, current_system.sign_up_user("Lukas","123Esel","123Esel","Mannheim","11105","AMG","10","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();
|
||||
assertEquals("", current_system.getDetails()[0]);
|
||||
assertEquals(true, current_system.sign_in_user("Lukas", "123Esel"));
|
||||
assertEquals("",current_system.getDetails()[0]);
|
||||
assertEquals(true, current_system.sign_in_user("Lukas","123Esel"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void change_user_details() {
|
||||
public void change_user_details(){
|
||||
|
||||
current_system.sign_in_user("David", "123Esel");
|
||||
current_system.change_user_details("Enes", "123Esel", "Mannheim", "68161", "", "", "", "");
|
||||
|
|
@ -156,7 +146,7 @@ public class SystemTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void change_user_password() {
|
||||
public void change_user_password(){
|
||||
|
||||
current_system.sign_in_user("David", "123Esel");
|
||||
assertEquals(true, current_system.change_user_password("123Esel", "Pizza69", "Pizza69"));
|
||||
|
|
@ -167,10 +157,11 @@ public class SystemTest {
|
|||
;
|
||||
|
||||
}
|
||||
/*
|
||||
* Tests auf Basis von user_data.csv:
|
||||
* Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
|
||||
* David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0
|
||||
*/
|
||||
/*
|
||||
Tests auf Basis von user_data.csv:
|
||||
Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
|
||||
David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0
|
||||
*/
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue