Permalink
Browse files

fixed javadocs, made mvn site:site working again, updated pom

  • Loading branch information...
akegermany committed Mar 6, 2016
1 parent 89b67fe commit b2110bdab9dd2b48df35f56c89add30cde241821
Showing with 157 additions and 600 deletions.
  1. +2 −1 .gitignore
  2. +0 −3 common/src/main/java/org/movsim/io/FileOutputBase.java
  3. +0 −107 common/src/main/java/org/movsim/utilities/FileUtils.java
  4. +0 −2 consumption/src/main/java/org/movsim/consumption/model/EnergyFlowModelFactory.java
  5. +0 −2 core/src/main/java/org/movsim/MovsimCoreMain.java
  6. +37 −35 core/src/main/java/org/movsim/input/network/OpenDriveHandler.java
  7. +0 −8 core/src/main/java/org/movsim/output/FileTrafficLightControllerRecorder.java
  8. +2 −9 core/src/main/java/org/movsim/roadmappings/RoadMapping.java
  9. +0 −10 core/src/main/java/org/movsim/roadmappings/RoadMappingPoly.java
  10. +0 −3 core/src/main/java/org/movsim/simulator/Simulator.java
  11. +7 −7 core/src/main/java/org/movsim/simulator/roadnetwork/LaneSegment.java
  12. +0 −3 core/src/main/java/org/movsim/simulator/roadnetwork/Lanes.java
  13. +10 −7 core/src/main/java/org/movsim/simulator/roadnetwork/RoadNetwork.java
  14. +2 −2 core/src/main/java/org/movsim/simulator/roadnetwork/RoadSegment.java
  15. +4 −5 core/src/main/java/org/movsim/simulator/roadnetwork/RoadSegmentUtils.java
  16. +0 −2 core/src/main/java/org/movsim/simulator/roadnetwork/boundaries/InflowTimeSeries.java
  17. +0 −3 core/src/main/java/org/movsim/simulator/vehicles/ExternalVehiclesController.java
  18. +12 −16 core/src/main/java/org/movsim/simulator/vehicles/Vehicle.java
  19. +16 −21 ...main/java/org/movsim/simulator/vehicles/longitudinalmodel/acceleration/LongitudinalModelBase.java
  20. +0 −1 ...n/java/org/movsim/simulator/vehicles/longitudinalmodel/acceleration/LongitudinalModelFactory.java
  21. +1 −21 core/src/test/java/org/movsim/simulator/roadnetwork/LinkTest.java
  22. +1 −179 core/src/test/java/org/movsim/simulator/roadnetwork/RoadSegmentTest.java
  23. +0 −52 core/src/test/java/org/movsim/simulator/roadnetwork/TrafficSourceTest.java
  24. +0 −38 core/src/test/java/org/movsim/simulator/roadnetwork/vehicles/lanechange/MOBILTest.java
  25. +62 −60 pom.xml
  26. +1 −3 ...va/org/movsim/simulator/vehicles/longitudinalmodel/acceleration/parameter/IModelParameterACC.java
View
@@ -6,7 +6,8 @@
*/.classpath
*/test-output
*/.gitignore
target/
**/target/
**/doc/
bin/
figs/
csv/
@@ -49,9 +49,6 @@
protected String filename;
protected PrintWriter writer;
/**
* Constructor, sets the path and base filename.
*/
public FileOutputBase(String path, String baseFilename) {
this.path = path;
this.baseFilename = baseFilename;
@@ -45,9 +45,6 @@
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
/**
* The Class FileUtils.
*/
public final class FileUtils {
private static Logger LOG = LoggerFactory.getLogger(FileUtils.class);
@@ -59,8 +56,6 @@ private FileUtils() {
/**
* Searches a file first in given location {@code filename} and second in path of the inputfile.
*
* @param filename
* @return the file if it exists
* @throws IllegalArgumentException
*/
public static File lookupFilename(String filename) throws IllegalArgumentException {
@@ -119,25 +114,6 @@ public static String currentDirectory() {
return System.getProperty("user.dir");
}
// /**
// * Home directory.
// *
// * @return the string
// */
// public static String homeDirectory() {
// final String home = System.getProperty("user.home");
// // if (home.equalsIgnoreCase("?")) {
// // }
// return home;
// }
/**
* File exists.
*
* @param filename
* the filename
* @return true, if successful
*/
public static boolean fileExists(String filename) {
final File file = new File(filename);
if (file.exists() && file.isFile()) {
@@ -147,15 +123,6 @@ public static boolean fileExists(String filename) {
return (false);
}
/**
* Dir exists. check if directory exists (in fact the same as file)
*
* @param path
* the path
* @param msg
* the additional message
* @return true, if successful
*/
public static boolean dirExists(String path, String msg) {
final File file = new File(path);
if (file.exists() && file.isDirectory()) {
@@ -165,14 +132,6 @@ public static boolean dirExists(String path, String msg) {
return (false);
}
/**
* Creates the directory, if it does not exit already. Elsewise, does nothing.
*
* @param path
* the path
* @param msg
* the msg
*/
public static void createDir(String path, String msg) {
final File file = new File(path);
if (dirExists(path, msg)) {
@@ -185,14 +144,6 @@ public static void createDir(String path, String msg) {
}
}
/**
* Delete file.
*
* @param filename
* the filename
* @param msg
* the msg
*/
public static void deleteFile(String filename, String msg) {
final File file = new File(filename);
if (file.exists()) {
@@ -204,14 +155,6 @@ public static void deleteFile(String filename, String msg) {
}
}
/**
* Deletes all files and subdirectories under dir.
*
* @param dir
* the dir
* @return true, if all deletions were successful. If a deletion fails, the method stops attempting to delete and
* returns false.
*/
private static boolean deleteDir(File dir) {
if (dir.isDirectory()) {
final String[] children = dir.list();
@@ -225,12 +168,6 @@ private static boolean deleteDir(File dir) {
return dir.delete();
}
/**
* Delete dir.
*
* @param dirName
* the dir name
*/
public static void deleteDir(String dirName) {
if (!dirExists(dirName, "FileUtils...deleteDir...")) {
return;
@@ -242,15 +179,6 @@ public static void deleteDir(String dirName) {
}
}
/**
* Gets the file list.
*
* @param path
* the path
* @param regexExpression
* the regexExpression
* @return the file list
*/
public static String[] getFileList(String path, String regex) {
final File dir = new File(path);
@@ -280,14 +208,6 @@ public boolean accept(File f, String name) {
return (fileNames);
}
/**
* Delete file list.
*
* @param path
* the path
* @param regexExpression
* the regexExpression
*/
public static void deleteFileList(String path, String regex) {
final String[] files = getFileList(path + File.separator, regex);
for (int i = 0; i < files.length; i++) {
@@ -298,14 +218,6 @@ public static void deleteFileList(String path, String regex) {
}
}
/**
* Write stream to file.
*
* @param filename
* the filename
* @param is
* the is
*/
public static void writeStreamToFile(String filename, InputStream is) {
final PrintWriter writer = getWriter(filename);
try {
@@ -320,14 +232,6 @@ public static void writeStreamToFile(String filename, InputStream is) {
writer.close();
}
/**
* Resource to file.
*
* @param res
* the res
* @param filename
* the filename
*/
public static void resourceToFile(final InputStream resourceAsStream, String filename) {
try {
if (resourceAsStream == null) {
@@ -350,13 +254,6 @@ public static void resourceToFile(final InputStream resourceAsStream, String fil
}
}
/**
* Gets the inputsource from filename.
*
* @param filename
* the filename
* @return the input
*/
public static InputSource getInputSourceFromFilename(String filename) {
final File inputFile = new File(filename);
return getInputSourceFromFilename(inputFile);
@@ -394,10 +291,6 @@ public static String getCanonicalPathWithoutFilename(File file) {
return string;
}
/**
* @param outputPath
* @return
*/
public static String getCanonicalPath(String outputPath) {
final File file = new File(outputPath);
String path = null;
@@ -33,8 +33,6 @@ private void initialize(ConsumptionModels models) {
/**
* Returns a cached {@link EnergyFlowModel} for the given {@code label} name.
*
* @param label
* @return
*/
public EnergyFlowModel get(String label) {
return energyFlowModels.get(label);
@@ -28,7 +28,6 @@
import java.util.Locale;
import javax.xml.bind.JAXBException;
import javax.xml.parsers.ParserConfigurationException;
import org.movsim.autogen.Movsim;
import org.movsim.input.MovsimCommandLine;
@@ -53,7 +52,6 @@
* the command line arguments
* @throws SAXException
* @throws JAXBException
* @throws ParserConfigurationException
*/
public static void main(String[] args) throws JAXBException, SAXException {
Oops, something went wrong.

0 comments on commit b2110bd

Please sign in to comment.