MATSim Code

RoadPricingScoringFunction no longer extends CharyparNagelScoringFunction, but takes another ScoringFunction as Delegate. This allows the RoadPricingScoringFunction to be used with any ScoringFunction, not just the CharyparNagelScoringFunction. This required changes to RoadPricingScoringFunctionFactory and all places, where this class was instantiated.
CharyparNagelScoringFunction no longer writes the score into the plan in finish(), because that would have meant that every ScoringFunction would have to do this... instead, EventsToScore does this now, so that is a general solution that works for any ScoringFunction. Improved JavaDoc in ScoringFunction.java to make this clear.

extended the test cases:
- new test the constructor and getMin/MaxNorthing/Easting.
- new test get(area, collection)
- new test clear()
- new test execute()
- improved test for values(), test if we really get an UnsupportedOperationException on values().iterater().remove().
- improved test for serialization

Changes and Bugfixes to QuadTree:
- clear() now resets size to 0, sets hasChilds to false, increases modCount by 1
- added method get(double minX, double minY, double maxX, double maxY, Collection<T> values) to get all elements within the specified area.
- added methods get{Min,Max}{Easting,Northing}() to get the extend specified in the constructor.
- made QuadTree.Executor a static inner class, which requires thus again the Generic T (--> influence on other classes using the Executor)
- javadoc improvements

make sure tests runs also without internet connection to get local dtd's.

added JavaDoc to loadConfig()

Simplified the code in split() a little bit after the code coverage analysis showed than one if-condition always yielded true (and that could be theoretically be proved as well).

changed some methods in inner classes from public or private to "default" modifier, so access is more restricted from outside but not from inside the class.
moved call to decrementSize() out of an inner class to the main class, similar to the call to increaseSize().

added QuadTreeTest to the test suite.

test cases for QuadTree

several bugfixes to QuadTree:
- member 'size' is no longer declared as transient, because otherwise a de-serialized QuadTree would always have size=0, even if it had objects in the tree.
- member 'values', returned by method values(), is invalidated when objects are added or removed from the QuadTree. before, it could happen that values() did no longer return a true representation of the objets in the QuadTree.
- When calling get(double x, double y, double maxDistance), objects exactly "maxDistance" away from "(x, y)" are now returned as well (according to the javadoc). Before, only objecs with a distance smaller than maxDistance were returned.
Memory improvement:
- QuadTree.Leaf.values (an ArrayList) is now initialized with a capacity of 1, instead of the default capacity of 10. As we rarely have more than one object at one location, most of the entries were empty before, now the list has by default onle one place (which is used in that case).