Skip to content

Bug fixes for "plans" #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdrewc wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bug fixes for "plans" #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2e3f7f
Merge pull request #1 from sfcta/master
sdrewc Jan 2, 2019
630abc0
temp commit
Feb 9, 2018
984fb79
carry the tag through from the plan to its projects
sdrewc Sep 21, 2018
63af8b0
Allow user to override definition of STALE_YEARS with -y <float_years>
sdrewc Sep 21, 2018
ef05ea3
keep project from applying twice
sdrewc Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Wrangler/PlanSpecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ def __init__(self,champVersion,basedir,networkdir,plansubdir,projectsubdir=None,
except Exception as e:
self.projectdict[project_name]['tag'] = None
#WranglerLogger.debug('project %s: TAG error: %s' % (project_name, e))

## if kwargs:
## self.projectdict[project_name]["kwargs"]=kwargs

# if project = "dir1/dir2" assume dir1 is git, dir2 is the projectsubdir
(head,tail) = os.path.split(project_name)
Expand Down Expand Up @@ -104,11 +107,11 @@ def listOfProjects(self,netType='hwy'):

for proj in self.projects:
if netType in self.projectdict[proj]['nettypes']:
projectlist.append(self.projectAsDict(proj))
## if not self.modelyear or self.modelyear >= self.projectdict[proj]["year"]:
## projectlist.append(self.projectAsDict(proj))
## else:
## WranglerLogger.warn("not applying %s, projectyear %d >= modelyear %d" % (proj, self.projectdict[proj]["year"], self.modelyear))
## projectlist.append(self.projectAsDict(proj))
if not self.modelyear or self.modelyear >= self.projectdict[proj]["year"]:
projectlist.append(self.projectAsDict(proj))
else:
WranglerLogger.warn("not applying %s, projectyear %d >= modelyear %d" % (proj, self.projectdict[proj]["year"], self.modelyear))
return projectlist

def printProjects(self,fileObj):
Expand Down
1 change: 1 addition & 0 deletions Wrangler/TransitCapacity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# limitations under the License.

import copy,csv,os,re,string
from Logger import WranglerLogger
from .NetworkException import NetworkException

__all__ = ['TransitCapacity']
Expand Down
5 changes: 3 additions & 2 deletions Wrangler/TransitLine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class TransitLine(object):
"LRT":[14,15,21],
"Premium":[22,23,24,25,26,27,28,29,30],
"Ferry":[31],
"BART":[32]
"BART":[32,33]
}

# Do these modes have offstreet stops?
Expand All @@ -66,7 +66,8 @@ class TransitLine(object):
29:True, # Regional Rail/ACE/Amtrak
30:True, # HSR
31:True, # Ferry
32:True # BART
32:True, # BART
33:True # BART
}

def __init__(self, name=None, template=None):
Expand Down
32 changes: 26 additions & 6 deletions scripts/build_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* networks are built in OUT_DIR\TEST_hwy and OUT_DIR\TEST_trn
* RTP projects are not applied
* TAG is not used for TEST_PROJECTS

(Yes, you could just specify "-t" but I want you to spell it out. :)

The [-c configword] is if you want an optional word for your network_specification.py
Expand Down Expand Up @@ -99,6 +99,9 @@
# the TAG. This is meant for developing a network project.
TEST_PROJECTS = None

# Prompt user if project has not been updated in STALE_YEARS.
STALE_YEARS = 2

CHAMPVERSION = 5.0
CHAMP_NODE_NAMES = r'Y:\champ\util\nodes.xls'
###############################################################################
Expand Down Expand Up @@ -298,7 +301,7 @@ def getProjectAttributes(project):

if __name__ == '__main__':
os.system('mode con:cols=100')
optlist,args = getopt.getopt(sys.argv[1:],'c:m:')
optlist,args = getopt.getopt(sys.argv[1:],'c:m:y:')
NOW = time.strftime("%Y%b%d.%H%M%S")
os.environ['CHAMP_NODE_NAMES'] = CHAMP_NODE_NAMES

Expand All @@ -320,6 +323,7 @@ def getProjectAttributes(project):
for o,a in optlist:
if o=="-m": BUILD_MODE = a
if o=="-c": CONFIG_WORD = a
if o=="-y": STALE_YEARS = float(a)

if BUILD_MODE not in [None,"test"]:
print USAGE
Expand Down Expand Up @@ -360,6 +364,8 @@ def getProjectAttributes(project):
Wrangler.setupLogging(LOG_FILENAME, LOG_FILENAME.replace("info", "debug"))
Wrangler.TransitNetwork.capacity = Wrangler.TransitCapacity(directory=TRANSIT_CAPACITY_DIR)

(project_name, projType, tag, kwargs) = getProjectAttributes(NETWORK_PROJECTS['hwy'][0]) if len(NETWORK_PROJECTS['hwy']) > 0 else (None, None, None, None)
pop_index = 0
# Prepend the RTP roadway projects (if applicable -- not TEST mode and YEAR!=PIVOT_YEAR)
NONSF_PLANBAYAREA_SPECS = None
if BUILD_MODE != "test" and YEAR!=PIVOT_YEAR:
Expand All @@ -374,6 +380,7 @@ def getProjectAttributes(project):

# prepend the whole list to the hwy projects
NETWORK_PROJECTS['hwy'] = nonsf_projdirlist + NETWORK_PROJECTS['hwy']
pop_index = len(nonsf_projdirlist)

# Create a scratch directory to check out project repos into
SCRATCH_SUBDIR = "scratch"
Expand All @@ -382,14 +389,27 @@ def getProjectAttributes(project):
os.chdir(SCRATCH_SUBDIR)

# Initialize networks
BASE_HWY_TAG = TAG
if PIVOT_DIR:
# if this pivots off of an already built network...
hwy_basenetworkpath = os.path.join(PIVOT_DIR,"hwy")
elif projType == 'seed':
# if the seed is the first item in the project list, then make it the basenetworkpath,
# then remove it from the front so it doesn't get applied twice
hwy_basenetworkpath = project_name
BASE_HWY_TAG = tag
NETWORK_PROJECTS['hwy'].pop(pop_index)
else:
hwy_basenetworkpath = "Roads2010"

networks = {'hwy' :Wrangler.HighwayNetwork(champVersion=CHAMPVERSION,
basenetworkpath=os.path.join(PIVOT_DIR,"hwy") if PIVOT_DIR else "Roads2010",
basenetworkpath=hwy_basenetworkpath,
networkBaseDir=NETWORK_BASE_DIR,
networkProjectSubdir=NETWORK_PROJECT_SUBDIR,
networkSeedSubdir=NETWORK_SEED_SUBDIR,
networkPlanSubdir=NETWORK_PLAN_SUBDIR,
isTiered=True if PIVOT_DIR else False,
tag=TAG,
tag=BASE_HWY_TAG,
hwyspecsdir=NONSF_RTPDIR,
hwyspecs=NONSF_PLANBAYAREA_SPECS,
tempdir=TEMP_SUBDIR,
Expand Down Expand Up @@ -528,7 +548,7 @@ def getProjectAttributes(project):
applied_commit_age = datetime.datetime.now() - applied_commit_date

# if older than one year, holler
STALE_YEARS = 2

if applied_commit_age > datetime.timedelta(days=365*STALE_YEARS):
Wrangler.WranglerLogger.warn(" This project was last updated %.1f years ago (over %d), on %s" % \
(applied_commit_age.days/365.0,
Expand Down Expand Up @@ -619,7 +639,7 @@ def getProjectAttributes(project):
else:
(parentdir, networkdir, gitdir, projectsubdir) = networks[netmode].getClonedProjectArgs(project_name, None, projType, TEMP_SUBDIR)

applied_SHA1 = networks[netmode].applyProject(parentdir, networkdir, gitdir, projectsubdir)
applied_SHA1 = networks[netmode].applyProject(parentdir, networkdir, gitdir, projectsubdir, **kwargs)
appliedcount += 1

# Network Loop #3: write the networks.
Expand Down