Skip to content

Commit

Permalink
best case accessibility == min time. This was supposed to be in the l…
Browse files Browse the repository at this point in the history
…ast commit.
  • Loading branch information
mattwigway committed Aug 31, 2015
1 parent a8b9419 commit 7a72542
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
Expand Up @@ -167,9 +167,9 @@ public void setFromArray(int[][] times, ConfidenceCalculationMethod confidenceCa
*/ */
public ResultEnvelope makeResults(PointSet pointSet, boolean includeTimes, boolean includeHistograms, boolean includeIsochrones) { public ResultEnvelope makeResults(PointSet pointSet, boolean includeTimes, boolean includeHistograms, boolean includeIsochrones) {
ResultEnvelope envelope = new ResultEnvelope(); ResultEnvelope envelope = new ResultEnvelope();
envelope.worstCase = new ResultSet(mins, pointSet, includeTimes, includeHistograms, includeIsochrones); envelope.worstCase = new ResultSet(maxs, pointSet, includeTimes, includeHistograms, includeIsochrones);
envelope.avgCase = new ResultSet(avgs, pointSet, includeTimes, includeHistograms, includeIsochrones); envelope.avgCase = new ResultSet(avgs, pointSet, includeTimes, includeHistograms, includeIsochrones);
envelope.bestCase = new ResultSet(maxs, pointSet, includeTimes, includeHistograms, includeIsochrones); envelope.bestCase = new ResultSet(mins, pointSet, includeTimes, includeHistograms, includeIsochrones);
return envelope; return envelope;
} }


Expand All @@ -180,9 +180,9 @@ public ResultEnvelope makeResults(PointSet pointSet, boolean includeTimes, boole
*/ */
public ResultEnvelope makeIsochronesForVertices () { public ResultEnvelope makeIsochronesForVertices () {
ResultEnvelope envelope = new ResultEnvelope(); ResultEnvelope envelope = new ResultEnvelope();
envelope.worstCase = makeIsochroneForVertices(mins); envelope.worstCase = makeIsochroneForVertices(maxs);
envelope.avgCase = makeIsochroneForVertices(avgs); envelope.avgCase = makeIsochroneForVertices(avgs);
envelope.bestCase = makeIsochroneForVertices(maxs); envelope.bestCase = makeIsochroneForVertices(mins);
return envelope; return envelope;
} }


Expand Down
12 changes: 1 addition & 11 deletions src/main/java/org/opentripplanner/transit/TransportNetwork.java
@@ -1,26 +1,16 @@
package org.opentripplanner.transit; package org.opentripplanner.transit;


import com.conveyal.osmlib.OSM; import com.conveyal.osmlib.OSM;
import org.joda.time.LocalDate;
import org.nustaq.serialization.FSTObjectInput; import org.nustaq.serialization.FSTObjectInput;
import org.nustaq.serialization.FSTObjectOutput; import org.nustaq.serialization.FSTObjectOutput;
import org.opentripplanner.analyst.PointSet; import org.opentripplanner.analyst.PointSet;
import org.opentripplanner.profile.RaptorWorkerData;
import org.opentripplanner.streets.LinkedPointSet; import org.opentripplanner.streets.LinkedPointSet;
import org.opentripplanner.streets.StreetLayer; import org.opentripplanner.streets.StreetLayer;
import org.opentripplanner.streets.StreetRouter; import org.opentripplanner.streets.StreetRouter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;


import java.io.BufferedInputStream; import java.io.*;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Random; import java.util.Random;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
Expand Down

0 comments on commit 7a72542

Please sign in to comment.