Skip to content

Commit c45e294

Browse files
committed
Merge remote-tracking branch 'origin/code-review' into streaming-processing
2 parents 9a9ae08 + f054369 commit c45e294

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,9 @@ $RECYCLE.BIN/
483483
# Vim temporary swap files
484484
*.swp
485485

486-
# Ignore generated output directories
487-
*Output*
488-
*Output/
489-
490-
# Ignore test-generated directories
491486
test_input_*
492-
test_output_*
487+
test_output_*
488+
ImageConvolution/Agent_Processed_Output/
489+
ImageConvolution/Processed_Output_Par/
490+
ImageConvolution/Processed_Output_Seq/
491+
ImageConvolution/Processed_Output_*/

‎ImageConvolution.Tests/ConvolutionTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ public void Test_ImageIO_SaveAndLoad()
3535
public void Test_Convolve_ExtendStrategy()
3636
{
3737
double[,] image = { { 10, 10, 10 }, { 10, 10, 10 }, { 10, 10, 10 } };
38-
double[,] result = ConvolutionProcessor.Convolve(image, Kernels.BlurBox, ConvolutionProcessor.EdgeStrategy.Extend);
38+
double[,] result = ConvolutionProcessor.Convolve(image, Kernels.BlurBox, EdgeStrategy.Extend);
3939
Assert.Equal(10, Math.Round(result[1, 1]));
4040
}
4141

4242
[Fact]
4343
public void Test_Convolve_ZeroPaddingStrategy()
4444
{
4545
double[,] image = { { 10, 10, 10 }, { 10, 10, 10 }, { 10, 10, 10 } };
46-
double[,] result = ConvolutionProcessor.Convolve(image, Kernels.BlurBox, ConvolutionProcessor.EdgeStrategy.ZeroPadding);
46+
double[,] result = ConvolutionProcessor.Convolve(image, Kernels.BlurBox, EdgeStrategy.ZeroPadding);
4747
Assert.True(result[0, 0] < 10);
4848
}
4949

5050
[Fact]
5151
public void Test_ConvolveParallel()
5252
{
5353
double[,] image = { { 100, 100, 100 }, { 100, 100, 100 }, { 100, 100, 100 } };
54-
double[,] result = ParallelConvolutionProcessor.ConvolveParallel(image, Kernels.BlurBox, ParallelConvolutionProcessor.EdgeStrategy.Extend);
54+
double[,] result = ParallelConvolutionProcessor.ConvolveParallel(image, Kernels.BlurBox, EdgeStrategy.Extend);
5555
Assert.Equal(100, Math.Round(result[1, 1]));
5656
}
5757

@@ -75,7 +75,7 @@ public void Test_ConvolveParallel_ZeroPadding()
7575
double[,] result = ParallelConvolutionProcessor.ConvolveParallel(
7676
image,
7777
Kernels.BlurBox,
78-
ParallelConvolutionProcessor.EdgeStrategy.ZeroPadding);
78+
EdgeStrategy.ZeroPadding);
7979

8080
Assert.True(result[0, 0] < 10);
8181
}

0 commit comments

Comments
 (0)