Skip to content

Commit f02fb33

Browse files
committed
Rename Prim Algo's variable
1 parent 37b7d71 commit f02fb33

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ AIPrimTest >> setUp [
1919
{ #category : 'tests' }
2020
AIPrimTest >> testMinSpanningTreeComplex2 [
2121

22-
| tree graphType graph |
22+
| resultEdges graphType graph |
2323
graphType := AICyclicWeightedComplexFixture new.
2424
graph :=graphType complexWeightedGraph4.
2525
prim nodes: graph nodes.
@@ -29,17 +29,17 @@ AIPrimTest >> testMinSpanningTreeComplex2 [
2929
to: #second
3030
weight: #third.
3131
prim run.
32-
tree := prim reconstructMST collect: [ :e | e asTuple ].
33-
self assert: tree size equals: 11.
32+
resultEdges := prim minimumSpanningTreeEdges collect: [ :e | e asTuple ].
33+
self assert: resultEdges size equals: 11.
3434
self
35-
assert: (tree inject: 0 into: [ :sum :edge | sum + edge third ])
35+
assert: (resultEdges inject: 0 into: [ :sum :edge | sum + edge third ])
3636
equals: 112
3737
]
3838

3939
{ #category : 'tests' }
4040
AIPrimTest >> testMinimumSpanningTreeComplex [
4141

42-
| tree expectedEdges graphType graph |
42+
| resultEdges expectedEdges graphType graph |
4343
graphType := AICyclicWeightedComplexFixture new.
4444
graph :=graphType complexWeightedGraph3.
4545
prim nodes: graph nodes.
@@ -49,20 +49,20 @@ AIPrimTest >> testMinimumSpanningTreeComplex [
4949
to: #second
5050
weight: #third.
5151
prim run.
52-
tree := prim reconstructMST collect: [ :e | e asTuple ].
52+
resultEdges := prim minimumSpanningTreeEdges collect: [ :e | e asTuple ].
5353

5454
expectedEdges := #( #( $a $d 1 ) #( $d $e 1 ) #( $d $b 2 )
5555
#( $e $c 5 ) ).
56-
self assertCollection: tree hasSameElements: expectedEdges.
56+
self assertCollection: resultEdges hasSameElements: expectedEdges.
5757
self
58-
assert: (tree inject: 0 into: [ :sum :edge | sum + edge third ])
58+
assert: (resultEdges inject: 0 into: [ :sum :edge | sum + edge third ])
5959
equals: 9
6060
]
6161

6262
{ #category : 'tests' }
6363
AIPrimTest >> testMinimumSpanningTreeSimple [
6464

65-
| tree expectedEdges graphType graph |
65+
| resultEdges expectedEdges graphType graph |
6666
graphType := AICyclicWeightedSimpleFixture new.
6767
graph :=graphType simpleWeightedGraph2.
6868
prim nodes: graph nodes.
@@ -72,11 +72,11 @@ AIPrimTest >> testMinimumSpanningTreeSimple [
7272
to: #second
7373
weight: #third.
7474
prim run.
75-
tree := prim reconstructMST collect: [ :e | e asTuple ].
75+
resultEdges := prim minimumSpanningTreeEdges collect: [ :e | e asTuple ].
7676

7777
expectedEdges := #( #( 1 2 3 ) #( 2 3 1 ) #( 3 4 2 ) #( 4 5 3 ) ).
78-
self assertCollection: tree hasSameElements: expectedEdges.
78+
self assertCollection: resultEdges hasSameElements: expectedEdges.
7979
self
80-
assert: (tree inject: 0 into: [ :sum :edge | sum + edge third ])
80+
assert: (resultEdges inject: 0 into: [ :sum :edge | sum + edge third ])
8181
equals: 9
8282
]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ AIPrim >> minNode [
3939
]
4040

4141
{ #category : 'accessing' }
42-
AIPrim >> reconstructMST [
42+
AIPrim >> minimumSpanningTreeEdges [
4343

4444
^ treeEdges
4545
]
@@ -53,7 +53,7 @@ AIPrim >> nodeClass [
5353
{ #category : 'running' }
5454
AIPrim >> run [
5555

56-
| curNode curEdge treeEdges fromNode toNode primEdge |
56+
| curNode curEdge fromNode toNode primEdge |
5757
nodes do: [ :each | each distance: Float infinity ].
5858

5959
treeEdges := OrderedCollection new.

0 commit comments

Comments
 (0)