Add wrapped neighbors and enforce bounds checking for neighbor

Author: HossamSaberr

src/Containers-Array2D-Tests/CTArray2DTest.class.st

@@ -279,6 +279,38 @@ CTArray2DTest >> testNeighborsAtColumnAtRow [
 	self assert: (topCornerNeighbors includesAll: #(2 3 4)).
 ]
 
+{ #category : 'tests' }
+CTArray2DTest >> testNeighborsAtColumnAtRowOutOfBounds [
+
+	| array |
+
+	array := self arrayClass width2Height3.
+
+	self should: [ array neighborsAtColumn: 99 atRow: 99 ] raise: Error.
+]
+
+{ #category : 'tests' }
+CTArray2DTest >> testNeighborsAtColumnWrapAtRowWrap [
+
+	| array neighbors |
+
+	array := self arrayClass fromArray: #(1 2 3 4 5 6 7 8 9) width: 3.
+
+	neighbors := array neighborsAtColumnWrap: 1 atRowWrap: 1.
+
+	self assert: neighbors size equals: 8.
+	self assert: (neighbors includesAll: #(2 3 4 5 6 7 8 9)).
+]
+
+{ #category : 'tests' }
+CTArray2DTest >> testNeighborsAtColumnWrapAtRowWrapOutOfBounds [
+	| array |
+
+	array := self arrayClass width2Height3.
+
+	self should: [ array neighborsAtColumnWrap: 99 atRowWrap: 99 ] raise: Error.
+]
+
 { #category : 'tests-accessing' }
 CTArray2DTest >> testNeighborsEight [
 

src/Containers-Array2D/CTArray2D.class.st

@@ -323,17 +323,39 @@ CTArray2D >> leftToRightFromBottomToTopDo: aBlock [
 
 { #category : 'enumerating' }
 CTArray2D >> neighborsAtColumn: col atRow: row [
-	
+
 	| neighbors |
+
+	(col between: 1 and: self width) ifFalse: [ self error: 'Column out of bounds' ].
+	(row between: 1 and: self height) ifFalse: [ self error: 'Row out of bounds' ].
+
 	neighbors := OrderedCollection new.
-	
+
 	row - 1 to: row + 1 do: [ :r |
 		col - 1 to: col + 1 do: [ :c |
 			(r = row and: [ c = col ]) ifFalse: [
 				(r between: 1 and: self height) ifTrue: [
 					(c between: 1 and: self width) ifTrue: [
 						neighbors add: (self atColumn: c atRow: r) ] ] ] ] ].
-						
+
+	^ neighbors
+]
+
+{ #category : 'enumerating' }
+CTArray2D >> neighborsAtColumnWrap: col atRowWrap: row [
+
+	| neighbors |
+
+	(col between: 1 and: self width) ifFalse: [ self error: 'Column out of bounds' ].
+	(row between: 1 and: self height) ifFalse: [ self error: 'Row out of bounds' ].
+
+	neighbors := OrderedCollection new.
+
+	row - 1 to: row + 1 do: [ :r |
+		col - 1 to: col + 1 do: [ :c |
+			(r = row and: [ c = col ]) ifFalse: [
+				neighbors add: (self atColumnWrap: c atRowWrap: r) ] ] ].
+
 	^ neighbors
 ]