Skip to content

Commit

Permalink
fixing some naming
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeGuro committed Apr 30, 2015
1 parent ae7be33 commit af3769d
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 78 deletions.
113 changes: 45 additions & 68 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions GIS.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,26 +219,21 @@ def __dijkstrasAlgorithm(self, sourceCity, destCity):
return

def __findAdjacentSelectedEdges(self, city, notVisited):
neighbors = []
adjacent = []
for edge in self.edge_selections:
if edge.city1 is city and edge.city2 in notVisited:
neighbors.append(edge)
adjacent.append(edge)
elif edge.city2 is city and edge.city1 in notVisited:
neighbors.append(edge)
return neighbors
adjacent.append(edge)
return adjacent

def tour(self, start):
pass

x = Gis()
x.selectAllCities()
x.selectAllEdges()
#x.selectCities('state', 'CA')
#x.selectEdges(0, 1500)

#x.makeGraph()

#x.testMinMaxConsDistance()
x.testMinMaxConsDistance()

x.printEdges()
x.printCities('name')
Expand Down

0 comments on commit af3769d

Please sign in to comment.