Merge pull request #38 from astares/37-Cleanup-AIGraphReducerTestmerg…

…edNodesIn-should-use-isNotNil Cleanup: AIGraphReducerTest>>#mergedNodesIn: should use isNotNil
pharo-ai · Nov 22, 2023 · 8b9f916 · 8b9f916
2 parents 3029f27 + 536af26
commit 8b9f916
Show file tree

Hide file tree

Showing 28 changed files with 291 additions and 238 deletions.
diff --git a/src/AI-Algorithms-Graph-Tests/AIAstarTest.class.st b/src/AI-Algorithms-Graph-Tests/AIAstarTest.class.st
@@ -1,19 +1,21 @@
 Class {
-	#name : #AIAstarTest,
-	#superclass : #TestCase,
+	#name : 'AIAstarTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'astar'
 	],
-	#category : #'AI-Algorithms-Graph-Tests-Tests'
+	#category : 'AI-Algorithms-Graph-Tests-Tests',
+	#package : 'AI-Algorithms-Graph-Tests',
+	#tag : 'Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 AIAstarTest >> setUp [
 	super setUp.
 	astar := AIAstar new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testAseBasicCircuit [
 
 	|graphType graph |
@@ -39,7 +41,7 @@ AIAstarTest >> testAseBasicCircuit [
 	self assert: Float infinity equals: (astar findNode: $a) pathDistance
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testAseBasicCircuitBacktrack [
 
 	|graphType graph |
@@ -73,7 +75,7 @@ AIAstarTest >> testAseBasicCircuitBacktrack [
 				  reconstructPath))
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testComplexWeightedGraph2 [
 
 
@@ -95,7 +97,7 @@ AIAstarTest >> testComplexWeightedGraph2 [
 	self assert: (astar findNode: 5) pathDistance equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testComplexWeightedGraph2BackTracking [
 
 	| shortestPath graphType graph |
@@ -138,7 +140,7 @@ AIAstarTest >> testComplexWeightedGraph2BackTracking [
 	astar reset
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testComplexWeightedGraph3 [
 
 	|graphType graph |
@@ -158,7 +160,7 @@ AIAstarTest >> testComplexWeightedGraph3 [
 	self assert: (astar findNode: $e) pathDistance equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testComplexWeightedGraph3Backtracking [
 
 	| shortestPath graphType graph |
@@ -195,7 +197,7 @@ AIAstarTest >> testComplexWeightedGraph3Backtracking [
 	astar reset
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testSimpleWeightedGraph [
 
 	|graphType graph |
@@ -215,7 +217,7 @@ AIAstarTest >> testSimpleWeightedGraph [
 	self assert: (astar findNode: 5) pathDistance equals: 3
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIAstarTest >> testSimpleWeightedGraphBacktracking [
 
 	| shortestPath graphType graph |

diff --git a/src/AI-Algorithms-Graph-Tests/AIBFSTest.class.st b/src/AI-Algorithms-Graph-Tests/AIBFSTest.class.st
@@ -1,19 +1,21 @@
 Class {
-	#name : #AIBFSTest,
-	#superclass : #TestCase,
+	#name : 'AIBFSTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'bfsp'
 	],
-	#category : #'AI-Algorithms-Graph-Tests-Tests'
+	#category : 'AI-Algorithms-Graph-Tests-Tests',
+	#package : 'AI-Algorithms-Graph-Tests',
+	#tag : 'Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 AIBFSTest >> setUp [
 	super setUp.
 	bfsp := AIBFS new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBFSTest >> testAseGraph [
 
 	|graph graphType|
@@ -32,7 +34,7 @@ AIBFSTest >> testAseGraph [
 	self assert: (#() hasEqualElements: (bfsp runFrom: $f to: $a))
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBFSTest >> testAseSccGraph [
 
 	|graph graphType|
@@ -45,7 +47,7 @@ AIBFSTest >> testAseSccGraph [
 	self assert: (#( $a $b $d ) hasEqualElements: (bfsp runFrom: $a to: $d))
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBFSTest >> testComplexUndirectedGraph [
 
 	|graph graphType|
@@ -62,7 +64,7 @@ AIBFSTest >> testComplexUndirectedGraph [
 	self assert: (#( 4 3 2 12 9 ) hasEqualElements: (bfsp runFrom: 4 to: 9))
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBFSTest >> testSimpleGraph [
 
 	|graph graphType|
@@ -74,7 +76,7 @@ AIBFSTest >> testSimpleGraph [
 	self assert: (#( $d $c ) hasEqualElements: (bfsp runFrom: $d to: $c))
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBFSTest >> testWithoutCyclesComplexGraph [
 
 	|graph graphType|

diff --git a/src/AI-Algorithms-Graph-Tests/AIBellmanFordTest.class.st b/src/AI-Algorithms-Graph-Tests/AIBellmanFordTest.class.st
@@ -2,21 +2,23 @@
 An AIBellmanFordTest is a test class for testing the behavior of AIBellmanFord
 "
 Class {
-	#name : #AIBellmanFordTest,
-	#superclass : #TestCase,
+	#name : 'AIBellmanFordTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'bellmanFord'
 	],
-	#category : #'AI-Algorithms-Graph-Tests-Shortest path'
+	#category : 'AI-Algorithms-Graph-Tests-Shortest path',
+	#package : 'AI-Algorithms-Graph-Tests',
+	#tag : 'Shortest path'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 AIBellmanFordTest >> setUp [
 	super setUp.
 	bellmanFord := AIBellmanFord new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBellmanFordTest >> testNegativeUnconnectedWeightedGraph [
 
 	|graphType graph |
@@ -44,7 +46,7 @@ AIBellmanFordTest >> testNegativeUnconnectedWeightedGraph [
 	self assert: (bellmanFord findNode: 9) pathDistance equals: Float negativeInfinity
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBellmanFordTest >> testNegativeWeightedGraph [
 
 	|graphType graph |
@@ -71,7 +73,7 @@ AIBellmanFordTest >> testNegativeWeightedGraph [
 	self assert: (bellmanFord findNode: 9) pathDistance equals: Float negativeInfinity
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBellmanFordTest >> testNegativeWeightedGraph2 [
 
 	|graphType graph |
@@ -99,7 +101,7 @@ AIBellmanFordTest >> testNegativeWeightedGraph2 [
 	self assert: (bellmanFord findNode: 9) pathDistance equals: Float negativeInfinity
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 AIBellmanFordTest >> testNegativeWeightedGraphReconstrucPath [
 
 	|graphType graph |

diff --git a/src/AI-Algorithms-Graph-Tests/AICyclicNonWeightedComplexFixture.class.st b/src/AI-Algorithms-Graph-Tests/AICyclicNonWeightedComplexFixture.class.st
@@ -6,19 +6,21 @@ Graph Class:
 4. Complex Graphs
 "
 Class {
-	#name : #AICyclicNonWeightedComplexFixture,
-	#superclass : #Object,
+	#name : 'AICyclicNonWeightedComplexFixture',
+	#superclass : 'Object',
 	#instVars : [
 		'complexCycleGraph',
 		'complexCycleGraph2',
 		'complexUndirectedGraph',
 		'stronglyConnectedGraph',
 		'stronglyConnectedGraphWithObjects'
 	],
-	#category : #'AI-Algorithms-Graph-Tests-Fixture'
+	#category : 'AI-Algorithms-Graph-Tests-Fixture',
+	#package : 'AI-Algorithms-Graph-Tests',
+	#tag : 'Fixture'
 }
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> complexCycleGraph [
 
 	"https://i.imgur.com/4trPCcb.jpeg"
@@ -35,7 +37,7 @@ AICyclicNonWeightedComplexFixture >> complexCycleGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> complexCycleGraph2 [
 	| nodes edges graph|
 	nodes := $a to: $i.
@@ -52,7 +54,7 @@ AICyclicNonWeightedComplexFixture >> complexCycleGraph2 [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> complexUndirectedGraph [
 
 	"https://i.imgur.com/qK2zsYb.png"
@@ -72,7 +74,7 @@ AICyclicNonWeightedComplexFixture >> complexUndirectedGraph [
 	^graph
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 AICyclicNonWeightedComplexFixture >> initialize [ 
   |persons|
   super initialize .
@@ -84,7 +86,7 @@ AICyclicNonWeightedComplexFixture >> initialize [
   stronglyConnectedGraphWithObjects := self stronglyConnectedGraph: persons.
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> stronglyConnectedGraph [
 
 	"This a graph for 4 strongly connected components "
@@ -102,7 +104,7 @@ AICyclicNonWeightedComplexFixture >> stronglyConnectedGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> stronglyConnectedGraph: objects [
 
 	"This is the exact same graph as #stronglyConnectedGraph: but using a custom object"
@@ -122,7 +124,7 @@ AICyclicNonWeightedComplexFixture >> stronglyConnectedGraph: objects [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedComplexFixture >> stronglyConnectedGraph: graphBuilder withObjects: objects [
 
 	"This is the exact same graph as #stronglyConnectedGraph: but using a custom object"

diff --git a/src/AI-Algorithms-Graph-Tests/AICyclicNonWeightedSimpleFixture.class.st b/src/AI-Algorithms-Graph-Tests/AICyclicNonWeightedSimpleFixture.class.st
@@ -6,8 +6,8 @@ Graph Class:
 4. Simple Graphs
 "
 Class {
-	#name : #AICyclicNonWeightedSimpleFixture,
-	#superclass : #Object,
+	#name : 'AICyclicNonWeightedSimpleFixture',
+	#superclass : 'Object',
 	#instVars : [
 		'aseCircuitGraph',
 		'aseSccGraph',
@@ -17,10 +17,12 @@ Class {
 		'nestedCycleGraph',
 		'simpleGraphForHits'
 	],
-	#category : #'AI-Algorithms-Graph-Tests-Fixture'
+	#category : 'AI-Algorithms-Graph-Tests-Fixture',
+	#package : 'AI-Algorithms-Graph-Tests',
+	#tag : 'Fixture'
 }
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> aseCircuitGraph [
 
 	"https://i.imgur.com/t1S6dG4.jpeg"
@@ -37,7 +39,7 @@ AICyclicNonWeightedSimpleFixture >> aseCircuitGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> aseSccGraph [
 
 	| nodes edges graph|
@@ -50,7 +52,7 @@ AICyclicNonWeightedSimpleFixture >> aseSccGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> cycleGraph [
 
 	"https://i.imgur.com/MNtwA56.jpeg"
@@ -65,7 +67,7 @@ AICyclicNonWeightedSimpleFixture >> cycleGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> dependencyGraph [
 
 	| nodes edges graph|
@@ -80,7 +82,7 @@ AICyclicNonWeightedSimpleFixture >> dependencyGraph [
 	^graph
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 AICyclicNonWeightedSimpleFixture >> initialize [ 
   super initialize .
   aseCircuitGraph := self aseCircuitGraph . 
@@ -92,7 +94,7 @@ AICyclicNonWeightedSimpleFixture >> initialize [
   simpleGraphForHits := self simpleGraphForHits .
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> moduleGraph [
 
 	| nodes edges graph |
@@ -114,7 +116,7 @@ AICyclicNonWeightedSimpleFixture >> moduleGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> nestedCycleGraph [
 
 	"https://i.imgur.com/6lk0pmR.jpeg"
@@ -131,7 +133,7 @@ AICyclicNonWeightedSimpleFixture >> nestedCycleGraph [
 	^graph
 ]
 
-{ #category : #fixtures }
+{ #category : 'fixtures' }
 AICyclicNonWeightedSimpleFixture >> simpleGraphForHits [
 
 	"https://i.imgur.com/FvqrFbf.png"