Merge pull request #31 from virenvarma007/Search_using_dictionary

Test added and findNode fixed with O(1) complexity

Author: jordanmontt

src/AI-Algorithms-Graph-Tests/AIGraphAlgorithmTest.class.st

@@ -29,3 +29,71 @@ AIGraphAlgorithmTest >> testAddNodesFromChildrenBlock [
 				WideSymbol }.
 	self assert: (builder findNode: ByteSymbol) adjacentNodes isEmpty
 ]
+
+{ #category : #'as yet unclassified' }
+AIGraphAlgorithmTest >> testingAddingNodes [
+
+   |graphType graph dijkstra|
+	graphType := AICyclicWeightedSimpleFixture new.
+	graph :=graphType aseCircuitWeightedGraph.
+	dijkstra := AIDijkstra new.
+	dijkstra nodes: graph nodes.
+	dijkstra  
+	   edges: graph edges
+		from: #first
+		to: #second
+		weight: #third.
+		
+	self assert: 8 equals: (dijkstra nodes) size.
+	dijkstra addNodeFor: $i.
+	self assert: 9 equals: (dijkstra nodes) size.
+	self assert: Float infinity equals: (dijkstra findNode: $i) pathDistance.
+	
+]
+
+{ #category : #'as yet unclassified' }
+AIGraphAlgorithmTest >> testingFindingNodes [
+
+   |graphType graph dijkstra|
+	graphType := AICyclicWeightedSimpleFixture new.
+	graph :=graphType aseCircuitWeightedGraph.
+	dijkstra := AIDijkstra new.
+	dijkstra nodes: graph nodes.
+	dijkstra  
+	   edges: graph edges
+		from: #first
+		to: #second
+		weight: #third.
+		
+	self assert: Float infinity equals: (dijkstra findNode: $g) pathDistance.
+]
+
+{ #category : #'as yet unclassified' }
+AIGraphAlgorithmTest >> testingNodeDictionary [
+
+	|graphType graph dijkstra|
+	graphType := AICyclicWeightedSimpleFixture new.
+	graph :=graphType aseCircuitWeightedGraph.
+	dijkstra := AIDijkstra new.
+	dijkstra nodes: graph nodes.
+	dijkstra  
+	   edges: graph edges
+		from: #first
+		to: #second
+		weight: #third.
+	dijkstra runFrom: $a.
+	self assert: 1 equals: (dijkstra findNode: $b) pathDistance.
+	self assert: 8 equals: (dijkstra nodes) size.
+	
+	dijkstra addNodeFor: $i.
+	self assert: 9 equals: (dijkstra nodes) size.
+	self assert: Float infinity equals: (dijkstra findNode: $i) pathDistance.
+
+	dijkstra reset.
+	dijkstra runFrom: $c.
+	self assert: 2 equals: (dijkstra findNode: $b) pathDistance.
+
+	dijkstra reset.
+	dijkstra runFrom: $h.
+	self assert: Float infinity equals: (dijkstra findNode: $a) pathDistance
+]

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

@@ -10,7 +10,8 @@ Class {
 	#instVars : [
 		'nodes',
 		'edges',
-		'sortingBlock'
+		'sortingBlock',
+		'nodeDictionary'
 	],
 	#category : #'AI-Algorithms-Graph-Core'
 }
@@ -45,9 +46,14 @@ AIGraphAlgorithm >> addEdge: edgeModel from: sourceBlock to: targetBlock [
 { #category : #'building - graph' }
 AIGraphAlgorithm >> addNodeFor: aModel [
 
+	| newNode |
 	^ self
 		  findNode: aModel
-		  ifAbsent: [ nodes add: (self nodeClass with: aModel) ]
+		  ifAbsent: [ 
+			newNode := (self nodeClass with: aModel).
+			nodes add: newNode .
+			nodeDictionary at: aModel put: newNode .
+			 ]
 ]
 
 { #category : #'building - graph' }
@@ -168,15 +174,21 @@ AIGraphAlgorithm >> findNode: aModel [
 
 	"^ nodes findBinary: (self findBinaryBlock: aModel)."
 
-	^ nodes detect: [ :node | node model = aModel ]
+	"^ nodes detect: [ :node | node model = aModel ]"
+	
+	(nodeDictionary includesKey: aModel) ifTrue: [ ^ nodeDictionary at: aModel ]. 
+	Error signal: ('No Element in Graph : ',(aModel asString) ).  
+
 ]
 
 { #category : #accessing }
 AIGraphAlgorithm >> findNode: aModel ifAbsent: aBlock [
 
 	"^ nodes findBinary: (self findBinaryBlock: aModel) ifNone: aBlock"
 
-	^ nodes detect: [ :node | node model = aModel ] ifNone: aBlock
+	"^ nodes detect: [ :node | node model = aModel ] ifNone: aBlock"
+	
+	^nodeDictionary  at: aModel ifAbsent: aBlock.
 ]
 
 { #category : #accessing }
@@ -187,7 +199,9 @@ AIGraphAlgorithm >> findNode: aModel ifFound: aBlock [
 		  do: aBlock
 		  ifNone: [  ]"
 
-	^ nodes detect: [ :aNode | aNode model = aModel ] ifFound: aBlock
+	"^ nodes detect: [ :aNode | aNode model = aModel ] ifFound: aBlock"
+	
+	^nodeDictionary at: aModel ifPresent: aBlock.
 ]
 
 { #category : #accessing }
@@ -201,7 +215,8 @@ AIGraphAlgorithm >> initialize [
 
 	sortingBlock := [ :a :b | a model hash <= b model hash ].
 	nodes := SortedCollection sortUsing: sortingBlock.
-	edges := SortedCollection sortUsing: sortingBlock
+	edges := SortedCollection sortUsing: sortingBlock.
+	nodeDictionary := Dictionary new.
 ]
 
 { #category : #configuration }