Merge pull request #17 from sanjaybhat2004/sanjaybhat2004-patch-issue#5

Updated AIDijkstra.class.st

Author: jordanmontt

src/AI-Algorithms-Graph-Components/AIPathDistanceNode.class.st

@@ -8,7 +8,8 @@ Class {
 		'previousNode',
 		'visited',
 		'outgoingEdges',
-		'pathDistance'
+		'pathDistance',
+		'priority'
 	],
 	#category : #'AI-Algorithms-Graph-Components-Nodes'
 }
@@ -19,7 +20,9 @@ AIPathDistanceNode >> initialize [
 	super initialize.
 	outgoingEdges := OrderedCollection new.
 	pathDistance := Float infinity.
-	visited := false
+	visited := false.
+	priority := Float infinity. 
+	
 ]
 
 { #category : #accessing }
@@ -61,6 +64,18 @@ AIPathDistanceNode >> printOn: aStream [
 		nextPutAll: pathDistance asString
 ]
 
+{ #category : #accessing }
+AIPathDistanceNode >> priority [ 
+	
+	^ priority 
+]
+
+{ #category : #accessing }
+AIPathDistanceNode >> priority: anInteger [
+	
+	priority := anInteger.
+]
+
 { #category : #accessing }
 AIPathDistanceNode >> to: aNode edge: anEdge [
 

src/AI-Algorithms-Graph/AIDijkstra.class.st

@@ -35,9 +35,9 @@ AIDijkstra >> end: endModel [
 { #category : #actions }
 AIDijkstra >> newPriorityQueue [
 
-	"This is the naive implementation of the data structure."
+	"We use the Heap object defined in the SequenceableCollections package."
 
-	^ OrderedCollection new
+	^ Heap new
 ]
 
 { #category : #configuration }
@@ -70,11 +70,7 @@ AIDijkstra >> reconstructPath [
 { #category : #actions }
 AIDijkstra >> removeMostPromisingPair: aPriorityQueue [
 
-	"This is the naive implementation of the data structure."
-
-	| minValue |
-	minValue := aPriorityQueue detectMin: [ :assoc | assoc value ].
-	^ aPriorityQueue remove: minValue
+	^ aPriorityQueue removeFirst
 ]
 
 { #category : #initialization }
@@ -92,28 +88,31 @@ AIDijkstra >> run [
 
 	| pq |
 	pq := self newPriorityQueue.
-	pq add: start -> 0.
-
-	[ pq isNotEmpty ] whileTrue: [
-		| assoc node minWeight |
-		assoc := self removeMostPromisingPair: pq.
-		node := assoc key.
-		minWeight := assoc value.
+	pq sortBlock: [ :element1 :element2 | (element1 priority ) <= (element2 priority )].
+	start priority: 0.
+	pq add: start.
+
+	[ pq isNotEmpty ] whileTrue: [ 
+		| node minWeight |
+		node := self removeMostPromisingPair: pq.
+		minWeight := node priority.
 		node visited: true.
 
 		"Skip if the path weight is less than the one obtained from the pq.
 		This is an optimization for not processing unnecessary nodes."
-		node pathDistance < minWeight ifFalse: [
-			node outgoingEdges do: [ :edge |
-				edge to visited ifFalse: [
+		node pathDistance < minWeight ifFalse: [ 
+			node outgoingEdges do: [ :edge | 
+				edge to visited ifFalse: [ 
 					| newDistance |
 					newDistance := node pathDistance + edge weight.
-
-					newDistance < edge to pathDistance ifTrue: [
+					
+					newDistance < edge to pathDistance ifTrue: [ 
 						self updateDistance: newDistance of: edge to previousNode: node.
-						pq add: edge to -> newDistance ] ] ] ] ]
+						edge to priority: newDistance.
+						pq add: edge to] ] ] ] ]
 ]
 
+
 { #category : #running }
 AIDijkstra >> runFrom: startModel [