Refactoring

ha-ves · Oct 13, 2024 · 3b88b14 · 3b88b14
1 parent 9e2e1e1
commit 3b88b14
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 25 deletions.
diff --git a/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs b/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs
@@ -33,7 +33,6 @@ public void GlobalSetup()
 
             // Yolov8
             options.OnnxModel = _model8;
-            options.ModelVersion = ModelVersion.V8;
 
             options.Cuda = false;
             _cpuYolov8 = new Yolo(options);
@@ -43,7 +42,6 @@ public void GlobalSetup()
 
             // Yolov11
             options.OnnxModel = _model11;
-            options.ModelVersion = ModelVersion.V11;
 
             options.Cuda = false;
             _cpuYolov11 = new Yolo(options);

diff --git a/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs b/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs
@@ -36,15 +36,13 @@ public void GlobalSetup()
 
             // Yolov8
             options.OnnxModel = _modelV8;
-            options.ModelVersion = ModelVersion.V8;
             _cpuYolov8 = new Yolo(options);
 
             options.Cuda = true;
             _gpuYolov8 = new Yolo(options);
 
             // Yolov9
             options.OnnxModel = _modelV9;
-            options.ModelVersion = ModelVersion.V9;
             options.Cuda = false;
 
             _cpuYolov9 = new Yolo(options);
@@ -54,7 +52,6 @@ public void GlobalSetup()
 
             // Yolov10
             options.OnnxModel = _modelV10;
-            options.ModelVersion = ModelVersion.V10;
             options.Cuda = false;
 
             _cpuYolov10 = new Yolo(options);
@@ -64,7 +61,6 @@ public void GlobalSetup()
 
             // Yolov11
             options.OnnxModel = _modelV11;
-            options.ModelVersion = ModelVersion.V11;
             options.Cuda = false;
 
             _cpuYolov11 = new Yolo(options);

diff --git a/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs b/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs
@@ -33,7 +33,6 @@ public void GlobalSetup()
 
             // Yolov8
             options.OnnxModel = _model8;
-            options.ModelVersion = ModelVersion.V8;
 
             options.Cuda = false;
             _cpuYolov8 = new Yolo(options);
@@ -43,7 +42,6 @@ public void GlobalSetup()
 
             // Yolov11
             options.OnnxModel = _model11;
-            options.ModelVersion = ModelVersion.V11;
 
             options.Cuda = false;
             _cpuYolov11 = new Yolo(options);

diff --git a/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs b/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs
@@ -33,7 +33,6 @@ public void GlobalSetup()
 
             // Yolov8
             options.OnnxModel = _model8;
-            options.ModelVersion = ModelVersion.V8;
 
             options.Cuda = false;
             _cpuYolov8 = new Yolo(options);
@@ -43,7 +42,6 @@ public void GlobalSetup()
 
             // Yolov11
             options.OnnxModel = _model11;
-            options.ModelVersion = ModelVersion.V11;
 
             options.Cuda = false;
             _cpuYolov11 = new Yolo(options);

diff --git a/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs b/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs
@@ -33,7 +33,6 @@ public void GlobalSetup()
 
             // Yolov8
             options.OnnxModel = _model8;
-            options.ModelVersion = ModelVersion.V8;
 
             options.Cuda = false;
             _cpuYolov8 = new Yolo(options);
@@ -43,7 +42,6 @@ public void GlobalSetup()
 
             // Yolov11
             options.OnnxModel = _model11;
-            options.ModelVersion = ModelVersion.V11;
 
             options.Cuda = false;
             _cpuYolov11 = new Yolo(options);

diff --git a/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs b/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs
@@ -13,7 +13,6 @@ public void RunClassification_Yolov11_LabelImageCorrectly_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.Classification,
-                ModelVersion = ModelVersion.V11,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs b/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs
@@ -13,7 +13,6 @@ public void RunClassification_Yolov8_LabelImageCorrectly_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.Classification,
-                ModelVersion = ModelVersion.V8,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObbDetection_Yolov11_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObbDetection,
-                ModelVersion = ModelVersion.V11,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObbDetection_Yolov8_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObbDetection,
-                ModelVersion = ModelVersion.V8,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov10_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObjectDetection,
-                ModelVersion = ModelVersion.V10,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov11_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObjectDetection,
-                ModelVersion = ModelVersion.V11,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov8_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObjectDetection,
-                ModelVersion = ModelVersion.V8,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs
@@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov9_GetExpectedNumberOfObjects_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.ObjectDetection,
-                ModelVersion = ModelVersion.V9,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs
@@ -13,7 +13,6 @@ public void RunPoseEstimation_Yolov11_GetExpectedNumberOfPoseEstimations_AssertT
             {
                 OnnxModel = model,
                 ModelType = ModelType.PoseEstimation,
-                ModelVersion = ModelVersion.V11,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs
@@ -13,7 +13,6 @@ public void RunPoseEstimation_Yolov8_GetExpectedNumberOfPoseEstimations_AssertTr
             {
                 OnnxModel = model,
                 ModelType = ModelType.PoseEstimation,
-                ModelVersion = ModelVersion.V8,
                 Cuda = false
             });
 

diff --git a/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs b/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs
@@ -13,14 +13,13 @@ public void RunSegmentation_Yolov11_GetExpectedNumberOfSegmentations_AssertTrue(
             {
                 OnnxModel = model,
                 ModelType = ModelType.Segmentation,
-                ModelVersion = ModelVersion.V11,
                 Cuda = false
             });
 
             var image = SKImage.FromEncodedData(testImage);
 
             // Act
-            var results = yolo.RunSegmentation(image, 0.25, 0.45);
+            var results = yolo.RunSegmentation(image, 0.25, 0.65, 0.45);
 
             // Assert
             Assert.Equal(17, results.Count);

diff --git a/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs b/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs
@@ -13,7 +13,6 @@ public void RunSegmentation_Yolov8_GetExpectedNumberOfSegmentations_AssertTrue()
             {
                 OnnxModel = model,
                 ModelType = ModelType.Segmentation,
-                ModelVersion = ModelVersion.V8,
                 Cuda = false
             });