diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 1756d26..ae4cb91 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,8 @@ gradle-app.setting # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 # gradle/wrapper/gradle-wrapper.properties + +# Ignore Gradle build output directory +build + +class_diagram.plantuml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..aa19980 --- /dev/null +++ b/build.gradle @@ -0,0 +1,45 @@ +plugins { + id "com.github.roroche.plantuml" version "1.0.2" // (1) + id "org.fmiw.plantuml" version "0.1" +} +apply plugin: 'java' +apply plugin: 'application' + +mainClassName = 'de.mrgeorgen.v2g.powerGrid' + +// tag::repositories[] +repositories { + mavenCentral() +} +// end::repositories[] + +// tag::jar[] +jar { + archiveBaseName = 'v2g' + archiveVersion = '0.1.0' +} +// end::jar[] + +// tag::dependencies[] +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +dependencies { +} + +classDiagram { + packageName = 'de.mrgeorgen.v2g' + outputFile = project.file('class_diagram.plantuml') +} + +plantuml { + options { + format = 'png' + } + diagrams { + class_diagram { + sourceFile = project.file('class_diagram_custom.plantuml') + } + } +} +buildClassDiagram.dependsOn(build) diff --git a/class_diagram_custom.plantuml b/class_diagram_custom.plantuml new file mode 100644 index 0000000..52070fd --- /dev/null +++ b/class_diagram_custom.plantuml @@ -0,0 +1,37 @@ +@startuml + +class "car" { + battery : int + fullBattery : int + chargeLock : int + chargeSpeed : int + model : String + id : int + charge() + setChargeLock(double chargeLock) + double getBatteryRelativ() +} + +class "carGrid" { + dockedCars : ArrayList + models : carTemplate[] + chargeCars() + fillWithCars() +} + +class "carTemplate" { + model : String + chargeSpeed : int + fullBattery : int + range : int +} + +class "powerGrid" { + energieAvailable : int +} + +"carGrid" --> "*" "car" : dockedCars +"powerGrid" --> "carGrid" +"carGrid" --> "carTemplate" + +@enduml diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..da9702f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1bc2698 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/6.8/userguide/multi_project_builds.html + */ + +rootProject.name = 'v2g' diff --git a/src/main/java/de/mrgeorgen/v2g/car.java b/src/main/java/de/mrgeorgen/v2g/car.java new file mode 100644 index 0000000..75dfbf7 --- /dev/null +++ b/src/main/java/de/mrgeorgen/v2g/car.java @@ -0,0 +1,34 @@ +package de.mrgeorgen.v2g; + +public class car { + private int battery; + private final int fullBattery; + private int chargeLock; + private final int chargeSpeed; + private final String model; + private final int id; + + public car(String model, int fullBattery, int chargeSpeed, int id) { // id can be the same for different models + this.fullBattery = 1000 * fullBattery; // convert kWh to Wh + this.chargeSpeed = chargeSpeed * 1000; // convert kW to W + this.setChargeLock(0.6); + this.id = id; + this.model = model; + this.battery = this.fullBattery / 2; + } + public void charge() { + int chargeAmmount = Math.abs(powerGrid.energieAvailable) < this.chargeSpeed ? powerGrid.energieAvailable : powerGrid.energieAvailable > 0 ? this.chargeSpeed : -1 * this.chargeSpeed; + if(this.battery + chargeAmmount <= this.chargeLock && chargeAmmount < 0) chargeAmmount = (this.battery - this.chargeLock) * -1; // do not charge if the car gets under the charge lock + if(this.battery + chargeAmmount > this.fullBattery) chargeAmmount = this.fullBattery - this.battery; // prevent the battery from overcharging + if(this.battery + chargeAmmount < 0) chargeAmmount = this.battery * -1; // prevent the battery from dischargingunder 0% + if(chargeAmmount != 0) System.out.println(this.model + " nr. " + this.id + " is " + (chargeAmmount < 0 ? "dis" : "") + "charging with " + (double)Math.abs(chargeAmmount) / 1000 + " kW. battery: " + (double)this.battery / 1000 + "/" + (double)this.fullBattery / 1000 + " kWh (" + Math.round(getBatteryRelativ() * 100) + "%)"); + this.battery += chargeAmmount; + powerGrid.energieAvailable -= chargeAmmount; + } + public void setChargeLock(double chargeLock) { + this.chargeLock = (int)(this.fullBattery * chargeLock); + } + public double getBatteryRelativ() { + return (double)this.battery / this.fullBattery; + } +} diff --git a/src/main/java/de/mrgeorgen/v2g/carGrid.java b/src/main/java/de/mrgeorgen/v2g/carGrid.java new file mode 100644 index 0000000..6d7785a --- /dev/null +++ b/src/main/java/de/mrgeorgen/v2g/carGrid.java @@ -0,0 +1,41 @@ +package de.mrgeorgen.v2g; +import java.util.ArrayList; +import java.util.Random; +import java.util.Collections; +import java.util.Comparator; +import java.lang.Double; +public class carGrid { + public ArrayList dockedCars = new ArrayList(); + private final carTemplate[] models = {new carTemplate("Tesla Model 3", 50, 160, 335), + new carTemplate("Renault Zoe ZE50", 52, 46, 315), + new carTemplate("BMW i3", 38, 49, 235), + new carTemplate("Nissan Leaf", 36, 46, 220), + new carTemplate("Volkswagen ID.4", 150, 125, 400), + new carTemplate("Tesla Model S Long Range", 90, 250, 555), + new carTemplate("Smart EQ forfour", 17, 5, 95), + new carTemplate("Honda e", 29, 56, 170)}; + public void fillWithCars() { + Random random = new Random(); + for(carTemplate carModel : models) { + final int numberOfCars = random.nextInt(10); + for(int i = 0; i < numberOfCars; ++i) { + dockedCars.add(new car(carModel.model, carModel.fullBattery, carModel.chargeSpeed, i)); + } + } + } + public void chargeCars() { + Collections.sort(dockedCars, new Comparator() { + public int compare(car car1, car car2) { + Double car1RelativBattery = car1.getBatteryRelativ(); + Double car2RelativBattery = car2.getBatteryRelativ(); + return car1RelativBattery.compareTo(car2RelativBattery); + } + }); + if(powerGrid.energieAvailable < 0) Collections.reverse(dockedCars); + dockedCars.forEach((car car) -> { + car.charge(); + }); + if(powerGrid.energieAvailable > 0) System.out.println(powerGrid.energieAvailable + " W could not be used by the cars"); + else if(powerGrid.energieAvailable < 0) System.out.println(Math.abs(powerGrid.energieAvailable) + " W could not be taken from the cars"); + } +} diff --git a/src/main/java/de/mrgeorgen/v2g/carTemplate.java b/src/main/java/de/mrgeorgen/v2g/carTemplate.java new file mode 100644 index 0000000..a639bf3 --- /dev/null +++ b/src/main/java/de/mrgeorgen/v2g/carTemplate.java @@ -0,0 +1,15 @@ +package de.mrgeorgen.v2g; + +public class carTemplate { + public final String model; + public final int chargeSpeed; + public final int fullBattery; + public final int range; + + public carTemplate(String model, int fullBattery, int chargeSpeed, int range) { + this.model = model; + this.chargeSpeed = chargeSpeed; + this.fullBattery = fullBattery; + this.range = range; + } +} diff --git a/src/main/java/de/mrgeorgen/v2g/powerGrid.java b/src/main/java/de/mrgeorgen/v2g/powerGrid.java new file mode 100644 index 0000000..09f9adf --- /dev/null +++ b/src/main/java/de/mrgeorgen/v2g/powerGrid.java @@ -0,0 +1,26 @@ +package de.mrgeorgen.v2g; +import java.util.Random; +public class powerGrid { + public static int energieAvailable; + public static void main(String args[]) { + final carGrid carGrid = new carGrid(); + if(args.length != 1) { + System.out.println("Invalid Syntax. Use the number of days the simulation shell run as the first argument"); + return; + } + carGrid.fillWithCars(); + final int hourSimulationRuns = Integer.parseInt(args[0]) * 24; + Random random = new Random(); + for(int houresPassed = 0; houresPassed < hourSimulationRuns; ++houresPassed) { + final int hourOfDay = houresPassed % 24; + System.out.println("Day " + houresPassed / 24 + " Hour " + hourOfDay); + int averageEnergie; + if(hourOfDay < 6 || hourOfDay > 22) averageEnergie = carGrid.dockedCars.size() * 3000; // energie available at night + else if(hourOfDay < 7) averageEnergie = carGrid.dockedCars.size() * -1000; // energie for light in the morning + else if(hourOfDay < 19) averageEnergie = carGrid.dockedCars.size() * -500; // at the day energie is still needed but not as much because the lights are not on + else /* hourOfDay > 19 && hourOfDay < 23 */ averageEnergie = carGrid.dockedCars.size() * -1000; // the lights are on again + energieAvailable = (int)(averageEnergie * (0.5 + 1.5 * random.nextDouble())); + carGrid.chargeCars(); + } + } +}