commit 46b225430d423ed7ff6e6f4271b57545e40de2a3 Author: Ksan Date: Fri Jul 25 15:06:22 2025 +0200 changed project structure diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d38cf6a --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +transport_data.json + + +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e122dea --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..40ca015 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..35200d7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + dev.ksan + TravelPathOptimizer + 1.0-SNAPSHOT + TravelPathOptimizer + + + UTF-8 + 5.10.2 + + + + + org.openjfx + javafx-controls + 17.0.6 + + + org.openjfx + javafx-fxml + 17.0.6 + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 23 + 23 + + + + org.openjfx + javafx-maven-plugin + 0.0.8 + + + + default-cli + + dev.ksan.travelpathoptimizer/dev.ksan.travelpathoptimizer.app.TravelPathOptimizerApplication + + app + app + app + true + true + true + + + + + + + \ No newline at end of file diff --git a/src/main/java/dev/ksan/travelpathoptimizer/app/TransportDataGenerator.java b/src/main/java/dev/ksan/travelpathoptimizer/app/TransportDataGenerator.java new file mode 100644 index 0000000..e582dfc --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/app/TransportDataGenerator.java @@ -0,0 +1,224 @@ +package dev.ksan.travelpathoptimizer.app; + +import java.io.FileWriter; +import java.io.IOException; +import java.util.*; + +public class TransportDataGenerator { + private static final int SIZE = 10; + private int n; + private int m; + + private static final int DEPARTURES_PER_STATION = 1; + private static final Random random = new Random(); + + public static void main(String[] args) { + TransportDataGenerator generator = new TransportDataGenerator(2, 2); + TransportData data = generator.generateData(); + generator.saveToJson(data, "transport_data.json"); + System.out.println("Podaci su generisani i sacuvani kao transport_data.json"); + } + + TransportDataGenerator() { + this.n = SIZE; + this.m = SIZE; + } + + TransportDataGenerator(int n) { + this.n = n; + this.m = n; + } + + TransportDataGenerator(int n, int m) { + this.n = n; + this.m = m; + } + + // struktura podataka koja sadrzi sve trazene ulazne podatke + public static class TransportData { + public String[][] countryMap; + public List stations; + public List departures; + } + + public static class Station { + public String city; + public String busStation; + public String trainStation; + } + + public static class Departure { + public String type; // "autobus" ili "voz" + public String from; + public String to; + public String departureTime; + public int duration; // u minutama + public int price; + public int minTransferTime; // vrijeme potrebno za transfer (u minutama) + } + + public TransportData generateData() { + TransportData data = new TransportData(); + data.countryMap = generateCountryMap(); + data.stations = generateStations(); + data.departures = generateDepartures(data.stations); + return data; + } + + // generisanje gradova (G_X_Y) + private String[][] generateCountryMap() { + String[][] countryMap = new String[n][m]; + for (int x = 0; x < n; x++) { + for (int y = 0; y < m; y++) { + countryMap[x][y] = "G_" + x + "_" + y; + } + } + return countryMap; + } + + // generisanje autobuskih i zeljeznickih stanica + private List generateStations() { + List stations = new ArrayList<>(); + for (int x = 0; x < n; x++) { + for (int y = 0; y < m; y++) { + Station station = new Station(); + station.city = "G_" + x + "_" + y; + station.busStation = "A_" + x + "_" + y; + station.trainStation = "Z_" + x + "_" + y; + stations.add(station); + } + } + return stations; + } + + // generisanje vremena polazaka + private List generateDepartures(List stations) { + List departures = new ArrayList<>(); + + for (Station station : stations) { + int x = Integer.parseInt(station.city.split("_")[1]); + int y = Integer.parseInt(station.city.split("_")[2]); + + // generisanje polazaka autobusa + for (int i = 0; i < DEPARTURES_PER_STATION; i++) { + departures.add(generateDeparture("autobus", station.busStation, x, y)); + } + + // generisanje polazaka vozova + for (int i = 0; i < DEPARTURES_PER_STATION; i++) { + departures.add(generateDeparture("voz", station.trainStation, x, y)); + } + } + return departures; + } + + private Departure generateDeparture(String type, String from, int x, int y) { + Departure departure = new Departure(); + departure.type = type; + departure.from = from; + + // generisanje susjeda + List neighbors = getNeighbors(x, y); + departure.to = neighbors.isEmpty() ? from : neighbors.get(random.nextInt(neighbors.size())); + + // generisanje vremena + int hour = random.nextInt(24); + int minute = random.nextInt(4) * 15; // 0, 15, 30, 45 + departure.departureTime = String.format("%02d:%02d", hour, minute); + + // geneirsanje cijene + departure.duration = 30 + random.nextInt(151); + departure.price = 100 + random.nextInt(901); + + // generisanje vremena transfera + departure.minTransferTime = 5 + random.nextInt(26); + + return departure; + } + + // pronalazak susjednih gradova + private List getNeighbors(int x, int y) { + List neighbors = new ArrayList<>(); + int[][] directions = { { -1, 0 }, { 1, 0 }, { 0, -1 }, { 0, 1 } }; + + for (int[] dir : directions) { + int nx = x + dir[0]; + int ny = y + dir[1]; + if (nx >= 0 && nx < n && ny >= 0 && ny < m) { + neighbors.add("G_" + nx + "_" + ny); + } + } + return neighbors; + } + + // cuvanje podataka u JSON mapu + private void saveToJson(TransportData data, String filename) { + try (FileWriter file = new FileWriter(filename)) { + StringBuilder json = new StringBuilder(); + json.append("{\n"); + + // mapa drzave + json.append(" \"countryMap\": [\n"); + for (int i = 0; i < n; i++) { + json.append(" ["); + for (int j = 0; j < m; j++) { + json.append("\"").append(data.countryMap[i][j]).append("\""); + if (j < m - 1) + json.append(", "); + } + json.append("]"); + if (i < n - 1) + json.append(","); + json.append("\n"); + } + json.append(" ],\n"); + + // stanice + json.append(" \"stations\": [\n"); + for (int i = 0; i < data.stations.size(); i++) { + Station s = data.stations.get(i); + json.append(" {\"city\": \"") + .append(s.city) + .append("\", \"busStation\": \"") + .append(s.busStation) + .append("\", \"trainStation\": \"") + .append(s.trainStation) + .append("\"}"); + if (i < data.stations.size() - 1) + json.append(","); + json.append("\n"); + } + json.append(" ],\n"); + + // vremena polazaka + json.append(" \"departures\": [\n"); + for (int i = 0; i < data.departures.size(); i++) { + Departure d = data.departures.get(i); + json.append(" {\"type\": \"") + .append(d.type) + .append("\", \"from\": \"") + .append(d.from) + .append("\", \"to\": \"") + .append(d.to) + .append("\", \"departureTime\": \"") + .append(d.departureTime) + .append("\", \"duration\": ") + .append(d.duration) + .append(", \"price\": ") + .append(d.price) + .append(", \"minTransferTime\": ") + .append(d.minTransferTime) + .append("}"); + if (i < data.departures.size() - 1) + json.append(","); + json.append("\n"); + } + json.append(" ]\n"); + + json.append("}"); + file.write(json.toString()); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/app/TravelPathOptimizerApplication.java b/src/main/java/dev/ksan/travelpathoptimizer/app/TravelPathOptimizerApplication.java new file mode 100644 index 0000000..5aa86c6 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/app/TravelPathOptimizerApplication.java @@ -0,0 +1,23 @@ +package dev.ksan.travelpathoptimizer.app; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import java.io.IOException; + +public class TravelPathOptimizerApplication extends Application { + @Override + public void start(Stage stage) throws IOException { + FXMLLoader fxmlLoader = new FXMLLoader(TravelPathOptimizerApplication.class.getResource("hello-view.fxml")); + Scene scene = new Scene(fxmlLoader.load(), 320, 240); + stage.setTitle("Hello!"); + stage.setScene(scene); + stage.show(); + } + + public static void main(String[] args) { + launch(); + } +} \ No newline at end of file diff --git a/src/main/java/dev/ksan/travelpathoptimizer/controller/TransportPathOptimizerController.java b/src/main/java/dev/ksan/travelpathoptimizer/controller/TransportPathOptimizerController.java new file mode 100644 index 0000000..8fc2899 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/controller/TransportPathOptimizerController.java @@ -0,0 +1,14 @@ +package dev.ksan.travelpathoptimizer.controller; + +import javafx.fxml.FXML; +import javafx.scene.control.Label; + +public class TransportPathOptimizerController { + @FXML + private Label welcomeText; + + @FXML + protected void onHelloButtonClick() { + welcomeText.setText("Welcome to JavaFX Application!"); + } +} \ No newline at end of file diff --git a/src/main/java/dev/ksan/travelpathoptimizer/graph/Graph.java b/src/main/java/dev/ksan/travelpathoptimizer/graph/Graph.java new file mode 100644 index 0000000..f918d4b --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/graph/Graph.java @@ -0,0 +1,100 @@ +package dev.ksan.travelpathoptimizer.graph; + +import dev.ksan.travelpathoptimizer.model.City; +import dev.ksan.travelpathoptimizer.model.Departure; +import dev.ksan.travelpathoptimizer.model.Location; +import dev.ksan.travelpathoptimizer.service.CityManager; +import dev.ksan.travelpathoptimizer.util.JsonParser; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.PriorityQueue; + +public class Graph { + private City[][] matrix; + + public static void main(String[] args) { + List cities = JsonParser.parseCities("transport_data.json", "stations"); + List departures = JsonParser.getDeparturesList("transport_data.json", "departures"); + cities = JsonParser.loadDepartures(cities, departures); + City[][] map = JsonParser.loadMap("transport_data.json", "countryMap", cities); + + Graph graph = new Graph(map); + cities = JsonParser.loadDepartures(cities, departures); + System.out.println(cities.getFirst().getName() + " do " + cities.getLast().getName()); + for (City city : cities) { + CityManager.addCity(city); + } + Map result = + graph.calculateShortestPath(cities.getFirst(), cities.get(3), "hops"); + System.out.println( + cities.getLast().getName() + " = " + result.get(cities.get(3).getLocation())); + } + + public Map calculateShortestPath(City startCity, City endCity, String type) { + int n = matrix.length; + int m = matrix[0].length; + + Map distances = new HashMap<>(); + for (int i = 0; i < n; i++) { + for (int j = 0; j < m; j++) { + distances.put(new Location(i, j), Double.MAX_VALUE); + } + } + + distances.put(startCity.getLocation(), 0.0); + + PriorityQueue pq = + new PriorityQueue<>(Comparator.comparingDouble(city -> distances.get(city.getLocation()))); + pq.add(startCity); + + while (!pq.isEmpty()) { + City current = pq.poll(); + + // If we reached the end city, we can stop early + if (current == endCity) { + break; + } + + for (Departure dep : current.getDestinations()) { + City neighborCity = dep.getDestinationCity(); + Location neighborLocation = neighborCity.getLocation(); + + double newCost = 0.0; + double currentCost = distances.get(current.getLocation()); + if (type.equals("price")) { + newCost = distances.get(current.getLocation()) + dep.getPrice(); + } else if (type.equals("time")) { + newCost = distances.get(current.getLocation()) + dep.getDuration(); + } else if (type.equals("hops")) { + newCost = currentCost + 1; + } + + if (newCost < distances.get(neighborLocation)) { + distances.put(neighborLocation, newCost); + pq.add(neighborCity); + } + } + } + + return distances; + } + + public Graph(City[][] matrix) { + this.matrix = matrix; + } + + public void updateMatrix(City[][] matrix) { + this.matrix = matrix; + } + + public City[][] getMatrix() { + return matrix; + } + + public City getCity(Location loc) { + return matrix[loc.getX()][loc.getY()]; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/City.java b/src/main/java/dev/ksan/travelpathoptimizer/model/City.java new file mode 100644 index 0000000..10b2916 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/City.java @@ -0,0 +1,71 @@ +package dev.ksan.travelpathoptimizer.model; + +import java.util.ArrayList; +import java.util.List; + +public class City { + private String name; + private Station trainStation; + private Station busStation; + private Location location; + + City(String name, String bus, String train, int row, int col) { + this.name = name; + this.trainStation = new Station(TransportType.TRAIN, train); + this.busStation = new Station(TransportType.BUS, bus); + this.location = new Location(row, col); + } + + City(String name, Station bus, Station train, int row, int col) { + this.name = name; + this.trainStation = train; + this.busStation = bus; + this.location = new Location(row, col); + } + + public List getDestinations() { + List departures = new ArrayList<>(); + + for (Departure dep : busStation.getDepartures()) { + departures.add(dep); + } + for (Departure dep : trainStation.getDepartures()) { + departures.add(dep); + } + + return departures; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Station getTrainStation() { + return trainStation; + } + + public void setTrainStation(Station trainStation) { + this.trainStation = trainStation; + } + + public Station getBusStation() { + return busStation; + } + + public void setBusStation(Station busStation) { + this.busStation = busStation; + } + + public Location getLocation() { + return this.location; + } + + @Override + public String toString() { + return name + "\n\tTrain Station: " + trainStation + "\n\tBus Station: " + busStation; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/Departure.java b/src/main/java/dev/ksan/travelpathoptimizer/model/Departure.java new file mode 100644 index 0000000..fdf8313 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/Departure.java @@ -0,0 +1,84 @@ +package dev.ksan.travelpathoptimizer.model; + +import dev.ksan.travelpathoptimizer.service.CityManager; + +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +public class Departure { + private TransportType type; + private String from; + private String to; + private int duration; + private LocalTime departureTime; + private double price; + private int minTransferTime; + + public Departure( + TransportType type, + String from, + String to, + String departureTime, + int duration, + double price, + int minTransferTime) { + this.type = type; + this.from = from; + this.to = to; + this.departureTime = LocalTime.parse(departureTime, DateTimeFormatter.ofPattern("HH:mm")); + this.duration = duration; + this.price = price; + this.minTransferTime = minTransferTime; + } + + public City getDestinationCity() { + + return CityManager.getCityByName(to); + } + + public TransportType getType() { + return type; + } + + public String getFrom() { + return from; + } + + public String getTo() { + return to; + } + + public int getDuration() { + return duration; + } + + public double getPrice() { + return price; + } + + public int getMinTransferTime() { + return minTransferTime; + } + + @Override + public String toString() { + return "Departure{" + + "type=" + + type + + ", from='" + + from + + '\'' + + ", to='" + + to + + '\'' + + ", departureTime=" + + departureTime.format(DateTimeFormatter.ofPattern("HH:mm")) + + ", duration=" + + duration + + ", price=" + + price + + ", minTransferTime=" + + minTransferTime + + "}"; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/Location.java b/src/main/java/dev/ksan/travelpathoptimizer/model/Location.java new file mode 100644 index 0000000..b0bf4b1 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/Location.java @@ -0,0 +1,43 @@ +package dev.ksan.travelpathoptimizer.model; + +import java.util.Objects; + +public class Location { + + private int x; + private int y; + + public Location(int x, int y) { + this.x = x; + this.y = y; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Location location = (Location) o; + return x == location.x && y == location.y; + } + + @Override + public int hashCode() { + return Objects.hash(x, y); + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/Station.java b/src/main/java/dev/ksan/travelpathoptimizer/model/Station.java new file mode 100644 index 0000000..e08601c --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/Station.java @@ -0,0 +1,38 @@ +package dev.ksan.travelpathoptimizer.model; + +import java.util.ArrayList; +import java.util.List; + +public class Station { + + private TransportType type = TransportType.NOT_ASSIGNED; + private String name; + private List departures = new ArrayList(); + + Station() {} + + Station(TransportType type, String name) { + this.type = type; + this.name = name; + } + + public TransportType getType() { + return type; + } + + public String getName() { + return name; + } + + public List getDepartures() { + return departures; + } + + public void addDeparture(Departure departure) { + departures.add(departure); + } + @Override + public String toString() { + return "Station{" + "type=" + type + ", name=" + name + ", departures=" + departures; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/TransportType.java b/src/main/java/dev/ksan/travelpathoptimizer/model/TransportType.java new file mode 100644 index 0000000..3995450 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/TransportType.java @@ -0,0 +1,18 @@ +package dev.ksan.travelpathoptimizer.model; + +public enum TransportType { + NOT_ASSIGNED("null"), + BUS("autobus"), + TRAIN("voz"); + + private final String type; + + TransportType(String type) { + this.type = type; + } + + @Override + public String toString() { + return this.type; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/model/User.java b/src/main/java/dev/ksan/travelpathoptimizer/model/User.java new file mode 100644 index 0000000..cc21071 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/model/User.java @@ -0,0 +1,50 @@ +package dev.ksan.travelpathoptimizer.model; + +public class User { + private String name; + private int id; + private Location location; + private Location destination; + + private static int idCounter = 1; + // :TODO: + private static final String ID_FILE = "id_counter.txt"; + + public User(String name) { + this.name = name; + this.id = idCounter++; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } + + public Location getDestination() { + return destination; + } + + public void setDestination(Location destination) { + this.destination = destination; + } + + @Override + public String toString() { + return "User{id=" + id + ", name='" + name + "'}"; + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/service/CityManager.java b/src/main/java/dev/ksan/travelpathoptimizer/service/CityManager.java new file mode 100644 index 0000000..5a5df1e --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/service/CityManager.java @@ -0,0 +1,18 @@ +package dev.ksan.travelpathoptimizer.service; + +import dev.ksan.travelpathoptimizer.model.City; + +import java.util.HashMap; +import java.util.Map; + +public class CityManager { + private static Map cities = new HashMap<>(); + + public static void addCity(City city) { + cities.put(city.getName(), city); + } + + public static City getCityByName(String cityName) { + return cities.get(cityName); + } +} diff --git a/src/main/java/dev/ksan/travelpathoptimizer/util/JsonParser.java b/src/main/java/dev/ksan/travelpathoptimizer/util/JsonParser.java new file mode 100644 index 0000000..1745432 --- /dev/null +++ b/src/main/java/dev/ksan/travelpathoptimizer/util/JsonParser.java @@ -0,0 +1,255 @@ +package dev.ksan.travelpathoptimizer.util; + +import dev.ksan.travelpathoptimizer.model.City; +import dev.ksan.travelpathoptimizer.model.Departure; +import dev.ksan.travelpathoptimizer.model.TransportType; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class JsonParser { + /* + public static void main(String[] args) { + String[][] map = JsonParser.parseCountryMap("transport_data.json", "countryMap"); + List cities = JsonParser.parseCities("transport_data.json", "stations"); + List departures = JsonParser.getDeparturesList("transport_data.json", "departures"); + + cities = JsonParser.loadDepartures(cities, departures); + for (City city : cities) { + System.out.println(city); + } + } + */ + public static String getValue(String fileName, String key) { + StringBuilder json = new StringBuilder(); + try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) { + String line; + while ((line = reader.readLine()) != null) { + json.append(line.trim()); + } + } catch (Exception e) { + e.printStackTrace(); + } + + String searchKey = "\"" + key + "\": ["; + int keyIndex = json.indexOf(searchKey); + + if (keyIndex == -1) return null; + + String jsonString = json.toString(); + int startIndex = keyIndex + searchKey.length() - 1; + + int endIndex = findPair(jsonString, startIndex); + + if (endIndex == -1) return null; + + return jsonString.substring(startIndex, endIndex); + } + + public static City[][] loadMap(String fileName, String key, List cities) { + String[][] cityMap = parseCountryMap(fileName, key); + City[][] map = new City[cityMap.length][cityMap[0].length]; + + for (City city : cities) { + map[city.getLocation().getX()][city.getLocation().getY()] = city; + } + + return map; + } + + public static String[][] parseCountryMap(String fileName, String key) { + + String mapData = getValue(fileName, key); + + mapData = mapData.replaceAll("[\\[\\]]+", "|"); + String[] rows = mapData.split("\\|"); + + List matrixList = new ArrayList<>(); + + for (String row : rows) { + if (row.trim().isEmpty()) continue; + String[] cities = + Arrays.stream(row.split(",")) + .map(s -> s.replaceAll("\"", "").trim()) + .filter(s -> !s.isEmpty()) + .toArray(String[]::new); + if (cities.length > 0) matrixList.add(cities); + } + String[][] result = new String[matrixList.size()][]; + for (int i = 0; i < matrixList.size(); i++) { + + result[i] = matrixList.get(i); + } + /* + for (int i = 0; i < result.length; i++) { + for (int j = 0; j < result[i].length; j++) { + System.out.println("result[" + i + "][" + j + "] = " + result[i][j]); + } + } + */ + return result; + } + + public static List getDeparturesList(String fileName, String key) { + List departures = new ArrayList<>(); + + String departuresJson = getValue(fileName, key); + + String res = + departuresJson + .replaceAll("[\\{\\[\\]]", "") + .replaceAll("\\},", "\\|") + .replaceAll("\\}", "") + .replaceAll("\\\"", "") + .replaceAll( + "type:\\s|\\sfrom:\\s|\\sto:\\s|\\sdepartureTime:\\s|\\sduration:\\s|\\sprice:\\s|\\sminTransferTime:\\s", + ""); + + String[] arr = res.split("\\|"); + for (String a : arr) { + String[] temp = a.split(","); + departures.add( + new Departure( + parseTransportType(temp[0]), + temp[1], + temp[2], + temp[3], + Integer.parseInt(temp[4]), + Double.parseDouble(temp[5]), + Integer.parseInt(temp[6]))); + } + + return departures; + } + + public static List parseCities(String fileName, String key) { + String cityData = getValue(fileName, key); + String res = + cityData + .replaceAll("[\\[\\]]+", "") + .replaceAll("\\},\\{", "\n") + .replaceAll("[\\{\\}]", "") + .replaceAll("\\n", "|"); + + String[] arr = res.split("\\|"); + + List cities = new ArrayList<>(); + List list = new ArrayList<>(); + for (int i = 0; i < arr.length; i++) { + String[] temp = arr[i].split(","); + list.add(temp); + } + List temp = new ArrayList<>(); + List formatedList = new ArrayList<>(); + for (String[] a : list) { + temp.clear(); + formatedList.clear(); + for (String b : a) { + temp.add(b); + } + for (String item : temp) { + item = (item.replaceAll("\\\"[a-zA-Z]+\\\":\\s", "").trim().replaceAll("\\\"", "")); + } + + for (int j = 0; j < temp.size(); j++) { + formatedList.add( + temp.get(j).replaceAll("\\\"[a-zA-Z]+\\\":\\s", "").trim().replaceAll("\\\"", "")); + } + + String[] parts = formatedList.get(0).split("_"); + String name = formatedList.get(0); + String bus = formatedList.get(1); + String train = formatedList.get(2); + int x = Integer.parseInt(parts[1]); + int y = Integer.parseInt(parts[2]); + cities.add(new City(name, bus, train, x, y)); + } + return cities; + } + + // Way to slow for big sets of data because it has O(n*m) + public static List loadDeparturesOld(List cities, List departures) { + + for (Departure dep : departures) { + + for (City city : cities) { + + if (dep.getType() == TransportType.BUS) { + if (dep.getFrom().equals(city.getBusStation().getName())) { + city.getBusStation().addDeparture(dep); + } + } else if (dep.getType() == TransportType.TRAIN) { + + if (dep.getFrom().equals(city.getTrainStation().getName())) { + city.getTrainStation().addDeparture(dep); + } + } + } + } + return cities; + } + + public static List loadDepartures(List cities, List departures) { + + Map stationToCityMap = new HashMap(); + + for (City city : cities) { + if (city.getBusStation() != null) { + stationToCityMap.put(city.getBusStation().getName(), city); + } + if (city.getBusStation() != null) { + stationToCityMap.put(city.getTrainStation().getName(), city); + } + } + + for (Departure dep : departures) { + City city = stationToCityMap.get(dep.getFrom()); + + if (city != null) { + if (dep.getType() == TransportType.BUS + && city.getBusStation().getName().equals(dep.getFrom())) { + + city.getBusStation().addDeparture(dep); + } else if (dep.getType() == TransportType.TRAIN + && city.getTrainStation().getName().equals(dep.getFrom())) { + city.getTrainStation().addDeparture(dep); + } + } + } + return cities; + } + + private static int findPair(String str, int startIndex) { + + char open = str.charAt(startIndex); + char closed = (open == '[') ? ']' : '}'; + + int depth = 0; + for (int i = startIndex; i < str.length(); i++) { + char c = str.charAt(i); + if (c == open) { + depth++; + } else if (c == closed) { + depth--; + if (depth == 0) { + return i; + } + } + } + return -1; + } + + public static TransportType parseTransportType(String str) { + for (TransportType t : TransportType.values()) { + if (t.toString().equalsIgnoreCase(str)) { + return t; + } + } + return TransportType.NOT_ASSIGNED; + } +} diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..79d61a0 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,20 @@ +module dev.ksan.travelpathoptimizer { + requires javafx.controls; + requires javafx.fxml; + + + opens dev.ksan.travelpathoptimizer to javafx.fxml; + exports dev.ksan.travelpathoptimizer; + exports dev.ksan.travelpathoptimizer.app; + opens dev.ksan.travelpathoptimizer.app to javafx.fxml; + exports dev.ksan.travelpathoptimizer.controller; + opens dev.ksan.travelpathoptimizer.controller to javafx.fxml; + exports dev.ksan.travelpathoptimizer.model; + opens dev.ksan.travelpathoptimizer.model to javafx.fxml; + exports dev.ksan.travelpathoptimizer.util; + opens dev.ksan.travelpathoptimizer.util to javafx.fxml; + exports dev.ksan.travelpathoptimizer.service; + opens dev.ksan.travelpathoptimizer.service to javafx.fxml; + exports dev.ksan.travelpathoptimizer.graph; + opens dev.ksan.travelpathoptimizer.graph to javafx.fxml; +} \ No newline at end of file diff --git a/src/main/resources/dev/ksan/travelpathoptimizer/hello-view.fxml b/src/main/resources/dev/ksan/travelpathoptimizer/hello-view.fxml new file mode 100644 index 0000000..22bad9d --- /dev/null +++ b/src/main/resources/dev/ksan/travelpathoptimizer/hello-view.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + +