Commitd920e7f

vil02

and

appgurueu

authored

refactor: reduce code duplication inFloodFill (#1645)

* tests: add tests checking if floodFill funtions throw when location is outside* refactor: reduce code duplication by adding `checkLocation` to `FloodFill`* refactor: add and use `isInside`Co-authored-by: appgurueu <34514239+appgurueu@users.noreply.github.com>* Deduplicate further---------Co-authored-by: appgurueu <34514239+appgurueu@users.noreply.github.com>

1 parentd02e402 commitd920e7fCopy full SHA for d920e7f

File tree

2 files changed

+41

-31

lines changed

Recursive
- FloodFill.js
- test
  - FloodFill.test.js

2 files changed

+41

-31

lines changed

`‎Recursive/FloodFill.js`

Lines changed: 28 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*@see https://www.techiedelight.com/flood-fill-algorithm/`
`10`	`10`	`*/`
`11`	`11`
`12`		`-constneighbors=[`
	`12`	`+constneighborOffsets=[`
`13`	`13`	`[-1,-1],`
`14`	`14`	`[-1,0],`
`15`	`15`	`[-1,1],`
`@@ -20,6 +20,27 @@ const neighbors = [`
`20`	`20`	`[1,1]`
`21`	`21`	`]`
`22`	`22`
	`23`	`+functionisInside(rgbData,location){`
	`24`	`+constx=location[0]`
	`25`	`+consty=location[1]`
	`26`	`+returnx>=0&&x<rgbData.length&&y>=0&&y<rgbData[0].length`
	`27`	`+}`
	`28`	`+`
	`29`	`+functioncheckLocation(rgbData,location){`
	`30`	`+if(!isInside(rgbData,location)){`
	`31`	`+thrownewError('location should point to a pixel within the rgbData')`
	`32`	`+}`
	`33`	`+}`
	`34`	`+`
	`35`	`+function*neighbors(rgbData,location){`
	`36`	`+for(constoffsetofneighborOffsets){`
	`37`	`+constneighborLocation=[location[0]+offset[0],location[1]+offset[1]]`
	`38`	`+if(isInside(rgbData,neighborLocation)){`
	`39`	`+yieldneighborLocation`
	`40`	`+}`
	`41`	`+}`
	`42`	`+}`
	`43`	`+`
`23`	`44`	`/**`
`24`	`45`	`* Implements the flood fill algorithm through a breadth-first approach using a queue.`
`25`	`46`	`*`
`@@ -34,14 +55,7 @@ export function breadthFirstSearch(`
`34`	`55`	`targetColor,`
`35`	`56`	`replacementColor`
`36`	`57`	`){`
`37`		`-if(`
`38`		`-location[0]<0\|\|`
`39`		`-location[0]>=rgbData.length\|\|`
`40`		`-location[1]<0\|\|`
`41`		`-location[1]>=rgbData[0].length`
`42`		`-){`
`43`		`-thrownewError('location should point to a pixel within the rgbData')`
`44`		`-}`
	`58`	`+checkLocation(rgbData,location)`
`45`	`59`
`46`	`60`	`constqueue=[]`
`47`	`61`	`queue.push(location)`
`@@ -65,14 +79,7 @@ export function depthFirstSearch(`
`65`	`79`	`targetColor,`
`66`	`80`	`replacementColor`
`67`	`81`	`){`
`68`		`-if(`
`69`		`-location[0]<0\|\|`
`70`		`-location[0]>=rgbData.length\|\|`
`71`		`-location[1]<0\|\|`
`72`		`-location[1]>=rgbData[0].length`
`73`		`-){`
`74`		`-thrownewError('location should point to a pixel within the rgbData')`
`75`		`-}`
	`82`	`+checkLocation(rgbData,location)`
`76`	`83`
`77`	`84`	`depthFirstFill(rgbData,location,targetColor,replacementColor)`
`78`	`85`	`}`
`@@ -98,13 +105,8 @@ function breadthFirstFill(`
`98`	`105`
`99`	`106`	`if(rgbData[currentLocation[0]][currentLocation[1]]===targetColor){`
`100`	`107`	`rgbData[currentLocation[0]][currentLocation[1]]=replacementColor`
`101`		`-`
`102`		`-for(leti=0;i<neighbors.length;i++){`
`103`		`-constx=currentLocation[0]+neighbors[i][0]`
`104`		`-consty=currentLocation[1]+neighbors[i][1]`
`105`		`-if(x>=0&&x<rgbData.length&&y>=0&&y<rgbData[0].length){`
`106`		`-queue.push([x,y])`
`107`		`-}`
	`108`	`+for(constneighborLocationofneighbors(rgbData,currentLocation)){`
	`109`	`+queue.push(neighborLocation)`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`	`}`
`@@ -120,13 +122,8 @@ function breadthFirstFill(`
`120`	`122`	`functiondepthFirstFill(rgbData,location,targetColor,replacementColor){`
`121`	`123`	`if(rgbData[location[0]][location[1]]===targetColor){`
`122`	`124`	`rgbData[location[0]][location[1]]=replacementColor`
`123`		`-`
`124`		`-for(leti=0;i<neighbors.length;i++){`
`125`		`-constx=location[0]+neighbors[i][0]`
`126`		`-consty=location[1]+neighbors[i][1]`
`127`		`-if(x>=0&&x<rgbData.length&&y>=0&&y<rgbData[0].length){`
`128`		`-depthFirstFill(rgbData,[x,y],targetColor,replacementColor)`
`129`		`-}`
	`125`	`+for(constneighborLocationofneighbors(rgbData,location)){`
	`126`	`+depthFirstFill(rgbData,neighborLocation,targetColor,replacementColor)`
`130`	`127`	`}`
`131`	`128`	`}`
`132`	`129`	`}`

`‎Recursive/test/FloodFill.test.js`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,19 @@ describe('FloodFill', () => {`
`21`	`21`	`})`
`22`	`22`	`})`
`23`	`23`
	`24`	`+describe.each([breadthFirstSearch,depthFirstSearch])('%o',(floodFillFun)=>{`
	`25`	`+it.each([`
	`26`	`+[1,-1],`
	`27`	`+[-1,1],`
	`28`	`+[0,7],`
	`29`	`+[7,0]`
	`30`	`+])('throws for start position [%i, %i]',(location)=>{`
	`31`	`+expect(()=>`
	`32`	`+floodFillFun(generateTestRgbData(),location,green,orange)`
	`33`	`+).toThrowError()`
	`34`	`+})`
	`35`	`+})`
	`36`	`+`
`24`	`37`	`/**`
`25`	`38`	`* Utility-function to test the function "breadthFirstSearch".`
`26`	`39`	`*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitd920e7f

File tree

2 files changed

2 files changed

`‎Recursive/FloodFill.js`

`‎Recursive/test/FloodFill.test.js`

0 commit comments