[Travelr-commits] r28 - in pkg/travelr: R man tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Apr 30 21:18:02 CEST 2012
Author: jrawbits
Date: 2012-04-30 21:18:02 +0200 (Mon, 30 Apr 2012)
New Revision: 28
Modified:
pkg/travelr/R/Assignment_Set.R
pkg/travelr/R/Highway_Network.R
pkg/travelr/man/assignment.class.Rd
pkg/travelr/man/assignment.functions.Rd
pkg/travelr/man/assignment.set.Rd
pkg/travelr/man/bpr.function.Rd
pkg/travelr/man/build.intercepts.Rd
pkg/travelr/man/build.network.set.Rd
pkg/travelr/man/build.paths.Rd
pkg/travelr/man/cost.functions.Rd
pkg/travelr/man/free.flow.Rd
pkg/travelr/man/highway.assign.Rd
pkg/travelr/man/highway.net.Rd
pkg/travelr/man/intercept.set.Rd
pkg/travelr/man/ipf.Rd
pkg/travelr/man/node.map.Rd
pkg/travelr/man/objective.functions.Rd
pkg/travelr/man/package.Rd
pkg/travelr/man/parse.control.Rd
pkg/travelr/man/reaggregate.Rd
pkg/travelr/man/sample.networks.Rd
pkg/travelr/man/shortest.paths.Rd
pkg/travelr/man/skim.paths.Rd
pkg/travelr/man/tntp.Rd
pkg/travelr/man/utilities.Rd
pkg/travelr/tests/Test_01_Highway_Network.R
pkg/travelr/tests/Test_02_Assignment_Classes.R
pkg/travelr/tests/Test_03_Highway_Assignment.R
Log:
Fixed some bugs and updated the test folder to eliminate a problem writing back into an already existing folder in the test tree. Perhaps travelr will resume building correctly on R-Forge with these changes. A couple of small bug fixes were made elsewhere in the code and documentation.
Modified: pkg/travelr/R/Assignment_Set.R
===================================================================
--- pkg/travelr/R/Assignment_Set.R 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/R/Assignment_Set.R 2012-04-30 19:18:02 UTC (rev 28)
@@ -196,7 +196,7 @@
missing.cost.function<-sapply( c(aset$classes,classes), function(x) { if (is.null(x$cost.function)) TRUE; FALSE } )
if ( !all(missing.cost.function) && any(missing.cost.function) ) {
message("Assignment set classes have incomplete class functions:",
- paste(names(classes)[missing.cost.function],collapse=", "))
+ paste(names(classes)[missing.cost.function],collapse=", ")) # TODO: clean up indexing to handle errors better
return(FALSE)
}
missing.demand<-sapply( classes, function(x) { if (is.null(x$demand)) TRUE; FALSE } )
@@ -252,7 +252,7 @@
aset <- classes
if ( class(aclass)!="highway.assignment.class" )
stop("Must use make.assignment.class and add.assignment.classes to build an assignment class")
- if ( validate.assignment.classes(aset,added.class ) ) {
+ if ( validate.assignment.classes(aset,added.class ) ) { # TODO: second parameter is wrong
if ( all(match(aclass$name,names(aset$classes),nomatch=0)==0) ) {
added.class <- list(aclass)
names(added.class) <- aclass$name
Modified: pkg/travelr/R/Highway_Network.R
===================================================================
--- pkg/travelr/R/Highway_Network.R 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/R/Highway_Network.R 2012-04-30 19:18:02 UTC (rev 28)
@@ -80,7 +80,7 @@
if (!is.null(Link.fields) ) netwk$Link.fields<-Link.fields
else netwk$Link.fields<-c(From="From",To="To")
if (!is.null(Penalty)) {
- if (any(grep("^\\.PenaltyID$",names(links)))) warning("Replacing existing .PenaltyID field in turn penalties")
+ if (any(grep("^\\.PenaltyID$",names(Penalty)))) warning("Replacing existing .PenaltyID field in turn penalties")
Penalty$.PenaltyID<-1:nrow(Penalty)
netwk$Penalty<-Penalty
if (!is.null(Penalty.fields)) netwk$Penalty.fields<-Penalty.fields
Modified: pkg/travelr/man/assignment.class.Rd
===================================================================
--- pkg/travelr/man/assignment.class.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/assignment.class.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{assignment.class}
Modified: pkg/travelr/man/assignment.functions.Rd
===================================================================
--- pkg/travelr/man/assignment.functions.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/assignment.functions.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{Assignment Functions}
Modified: pkg/travelr/man/assignment.set.Rd
===================================================================
--- pkg/travelr/man/assignment.set.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/assignment.set.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{assignment.set}
Modified: pkg/travelr/man/bpr.function.Rd
===================================================================
--- pkg/travelr/man/bpr.function.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/bpr.function.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{BPR function}
Modified: pkg/travelr/man/build.intercepts.Rd
===================================================================
--- pkg/travelr/man/build.intercepts.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/build.intercepts.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{build.intercept.function}
Modified: pkg/travelr/man/build.network.set.Rd
===================================================================
--- pkg/travelr/man/build.network.set.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/build.network.set.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{build.network.set}
Modified: pkg/travelr/man/build.paths.Rd
===================================================================
--- pkg/travelr/man/build.paths.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/build.paths.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{Path functions}
Modified: pkg/travelr/man/cost.functions.Rd
===================================================================
--- pkg/travelr/man/cost.functions.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/cost.functions.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{cost.functions}
Modified: pkg/travelr/man/free.flow.Rd
===================================================================
--- pkg/travelr/man/free.flow.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/free.flow.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{free.flow}
Modified: pkg/travelr/man/highway.assign.Rd
===================================================================
--- pkg/travelr/man/highway.assign.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/highway.assign.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{highway.assign}
Modified: pkg/travelr/man/highway.net.Rd
===================================================================
--- pkg/travelr/man/highway.net.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/highway.net.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{highway.net}
Modified: pkg/travelr/man/intercept.set.Rd
===================================================================
--- pkg/travelr/man/intercept.set.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/intercept.set.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{intercept.set}
@@ -58,10 +58,10 @@
\examples{
\dontrun{
# Select links 17 and 24
-select.links <- ( network$Links$.LinkID %in% c(17,24) )
+select.links <- ( network$Links$.LinkID %%i%% c(17,24) )
-# but only if the trips originate in zones 1:3, and end up in zones 12:24
-zone.pairs <- data.matrix(expand.grid(c(1:3,12:24)))
+# but only if the trips originate in zones 1,3 and 5, and end up in zones 12:24
+zone.pairs <- data.matrix(expand.grid(c(1,3,5),c(12:24)))
select.matrix <- matrix(0,nrow=network$numZones,ncol=network$numZones)
select.matrix[zone.pairs] <- 1
select.od <- function(od) { od * select.matrix }
Modified: pkg/travelr/man/ipf.Rd
===================================================================
--- pkg/travelr/man/ipf.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/ipf.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{ipf}
Modified: pkg/travelr/man/node.map.Rd
===================================================================
--- pkg/travelr/man/node.map.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/node.map.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{map.highway.nodes}
Modified: pkg/travelr/man/objective.functions.Rd
===================================================================
--- pkg/travelr/man/objective.functions.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/objective.functions.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{objective.functions}
Modified: pkg/travelr/man/package.Rd
===================================================================
--- pkg/travelr/man/package.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/package.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{package-travelr}
Modified: pkg/travelr/man/parse.control.Rd
===================================================================
--- pkg/travelr/man/parse.control.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/parse.control.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{parse.control}
Modified: pkg/travelr/man/reaggregate.Rd
===================================================================
--- pkg/travelr/man/reaggregate.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/reaggregate.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{reaggregate.matrix}
Modified: pkg/travelr/man/sample.networks.Rd
===================================================================
--- pkg/travelr/man/sample.networks.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/sample.networks.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{sample.networks}
Modified: pkg/travelr/man/shortest.paths.Rd
===================================================================
--- pkg/travelr/man/shortest.paths.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/shortest.paths.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{shortest.paths}
Modified: pkg/travelr/man/skim.paths.Rd
===================================================================
--- pkg/travelr/man/skim.paths.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/skim.paths.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{Skim network}
Modified: pkg/travelr/man/tntp.Rd
===================================================================
--- pkg/travelr/man/tntp.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/tntp.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{tntp}
Modified: pkg/travelr/man/utilities.Rd
===================================================================
--- pkg/travelr/man/utilities.Rd 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/man/utilities.Rd 2012-04-30 19:18:02 UTC (rev 28)
@@ -12,7 +12,7 @@
%
% A copy of the GNU General Public License is available at
% http://www.r-project.org/Licenses/
-% and included in the R distribution (in directory share/licenses).
+% and included in the R distribution (in directory 'share/licenses').
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\name{travelr.utilities}
Modified: pkg/travelr/tests/Test_01_Highway_Network.R
===================================================================
--- pkg/travelr/tests/Test_01_Highway_Network.R 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/tests/Test_01_Highway_Network.R 2012-04-30 19:18:02 UTC (rev 28)
@@ -188,7 +188,8 @@
}
# Then save the files
- n.out<-paste("data/",n,".rda",sep="")
+# n.out<-paste("data/",n,".rda",sep="")
+ n.out<-paste(n,".rda",sep="")
out<-paste(n,c(".net",".od"),sep="")
cat("Saving",n,"as",n.out)
assign(out[1],temp.hwy)
Modified: pkg/travelr/tests/Test_02_Assignment_Classes.R
===================================================================
--- pkg/travelr/tests/Test_02_Assignment_Classes.R 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/tests/Test_02_Assignment_Classes.R 2012-04-30 19:18:02 UTC (rev 28)
@@ -2,7 +2,7 @@
# Load SiouxFalls network
-load("data/SiouxFalls.rda")
+load("SiouxFalls.rda")
stopifnot(exists("SiouxFalls.net"))
stopifnot(exists("SiouxFalls.od"))
@@ -45,7 +45,7 @@
# Save out an .Rdata file containing:
# SiouxFalls network, assignment set
# Richmond network, assignment set (total), assignment set (multi)
-save(SiouxFalls.net,SiouxFalls.od,aset.sf,file="data/SiouxFallsAset.Rdata")
+save(SiouxFalls.net,SiouxFalls.od,aset.sf,file="SiouxFallsAset.Rdata")
# That should be all we need for further testing (Test_03_Assignment)
# This code will become part of the basic vignettes showing how to manipulate
Modified: pkg/travelr/tests/Test_03_Highway_Assignment.R
===================================================================
--- pkg/travelr/tests/Test_03_Highway_Assignment.R 2010-05-17 23:43:23 UTC (rev 27)
+++ pkg/travelr/tests/Test_03_Highway_Assignment.R 2012-04-30 19:18:02 UTC (rev 28)
@@ -3,7 +3,7 @@
# load prepared assignment sets and run them through some assignment algorithms.
-load(file="data/SiouxFallsAset.Rdata")
+load(file="SiouxFallsAset.Rdata")
options(width=120)
cat("SiouxFalls test assignment\n")
@@ -113,4 +113,4 @@
cat("Assignment with Frank-Wolfe method\n")
aresult<-highway.assign(aset.sf,method="Frank.Wolfe",control=list(verbose=1,log=TRUE,max.iter=100))
print(aresult$log)
-save(aresult,file="MSA_Assignment_Results.Rdata")
+save(aresult,file="Frank-Wolfe_Assignment_Results.Rdata")
More information about the Travelr-commits
mailing list