Renamed prepared -> contracted

This commit is contained in:
Patrick Niklaus
2016-03-04 16:12:10 +01:00
parent e595bdb20a
commit 92a06c9a28
12 changed files with 27 additions and 27 deletions
+1 -1
View File
@@ -173,7 +173,7 @@ Given /^the data has been extracted$/ do
end
end
Given /^the data has been prepared$/ do
Given /^the data has been contracted$/ do
begin
reprocess
rescue OSRMError => e
+1 -1
View File
@@ -29,7 +29,7 @@ When /^I request a travel time matrix I should get$/ do |table|
reprocess
actual = []
actual << table.headers
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
# compute matrix
params = @query_params
+1 -1
View File
@@ -1,7 +1,7 @@
When /^I match I should get$/ do |table|
reprocess
actual = []
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
table.hashes.each_with_index do |row,ri|
if row['request']
got = {'request' => row['request'] }
+1 -1
View File
@@ -1,7 +1,7 @@
When /^I request nearest I should get$/ do |table|
reprocess
actual = []
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
table.hashes.each_with_index do |row,ri|
in_node = find_node_by_name row['in']
raise "*** unknown in-node '#{row['in']}" unless in_node
+1 -1
View File
@@ -1,6 +1,6 @@
When /^I request \/(.*)$/ do |path|
reprocess
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
@response = request_path path, []
end
end
+1 -1
View File
@@ -44,7 +44,7 @@ Then /^routability should be$/ do |table|
if table.headers&["forw","backw","bothw"] == []
raise "*** routability tabel must contain either 'forw', 'backw' or 'bothw' column"
end
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
table.hashes.each_with_index do |row,i|
output_row = row.dup
attempts = []
+1 -1
View File
@@ -1,7 +1,7 @@
When /^I route I should get$/ do |table|
reprocess
actual = []
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
table.hashes.each_with_index do |row,ri|
if row['request']
got = {'request' => row['request'] }
+1 -1
View File
@@ -1,7 +1,7 @@
When /^I plan a trip I should get$/ do |table|
reprocess
actual = []
OSRMLoader.load(self,"#{prepared_file}.osrm") do
OSRMLoader.load(self,"#{contracted_file}.osrm") do
table.hashes.each_with_index do |row,ri|
if row['request']
got = {'request' => row['request'] }