Removed custom initializer

Author: priankakariat

tensorflow_lite_support/ios/task/processor/sources/TFLClassificationResult.h

@@ -47,42 +47,13 @@ NS_ASSUME_NONNULL_BEGIN
  * probability). */
 @property(nonatomic, copy) NSArray<TFLCategory *> *categories;
 
-/**
- * Initializes an instance of TFLClassifications for an image classifier head with given index and
- * list of predicted categories.
- *
- * @param categories list of predicted categories for classification head that should be
- * represeented by the initialized TFLClassification.
- * @param headIndex index of the image classifier head this instance of TFLClassifications should
- * represent.
- * @return An instance of TFLClassifications.
- */
-- (instancetype)initWithCategories:(NSArray<TFLCategory *> *)categories headIndex:(int)headIndex;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-+ (instancetype)new NS_UNAVAILABLE;
-
 @end
 
 /** Encapsulates results of any classification task. */
 @interface TFLClassificationResult : NSObject
 
 @property(nonatomic, copy) NSArray<TFLClassifications *> *classifications;
 
-/**
- * Initializes an instance of TFLClassifications for an image classifier head with given index and
- * list of predicted categories.
- *
- * @param classifications list containing results of image classifier heads.
- * @return An instance of TFLClassifications.
- */
-- (instancetype)initWithClassifications:(NSArray<TFLClassifications *> *)classifications;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-+ (instancetype)new NS_UNAVAILABLE;
-
 @end
 
 NS_ASSUME_NONNULL_END

tensorflow_lite_support/ios/task/processor/sources/TFLClassificationResult.m

@@ -25,33 +25,9 @@ @implementation TFLClassifications
 @synthesize headIndex;
 @synthesize categories;
 
-- (instancetype)initWithCategories:(NSArray<TFLCategory *> *)categories headIndex:(int)headIndex {
-  if (!categories) {
-    return nil;
-  }
-  self = [super init];
-  if (self) {
-    self.categories = categories;
-    self.headIndex = headIndex;
-  }
-  return self;
-}
 @end
 
 @implementation TFLClassificationResult
 @synthesize classifications;
 
-- (instancetype)initWithClassifications:(NSArray<TFLClassifications *> *)classifications {
-  if (!classifications) {
-    return nil;
-  }
-  self = [super init];
-
-  if (self) {
-    self.classifications = classifications;
-  }
-
-  return self;
-}
-
 @end

tensorflow_lite_support/ios/task/processor/utils/sources/TFLClassificationUtils.m

@@ -42,12 +42,15 @@ + (TFLClassificationResult *)classificationResultFromCClassificationResults:
       resultCategory.classIndex = (NSInteger)cCategory.index;
       [classes addObject:resultCategory];
     }
-
-    [classificationHeads addObject:[[TFLClassifications alloc] initWithCategories:classes
-                                                                        headIndex:i]];
+    TFLClassifications *classificationHead = [[TFLClassifications alloc] init];
+    classificationHead.categories = classes;
+    classificationHead.headIndex = i;
+    [classificationHeads addObject:classificationHead];
   }
 
-  return [[TFLClassificationResult alloc] initWithClassifications:classificationHeads];
+  TFLClassificationResult *classificationResult = [[TFLClassificationResult alloc] init];
+  classificationResult.classifications = classificationHeads; 
+  return classificationResult;
 }
 
 @end

tensorflow_lite_support/ios/test/task/vision/image_classifier/TFLImageClassifierTests.swift

@@ -49,13 +49,14 @@ class TFLImageClassifierTests: XCTestCase {
     let imageClassifier =
       try TFLImageClassifier.imageClassifier(options: imageClassifierOptions!)
 
-    let gmlImage = try gmlImage(withName:"burger_crop", ofType:"jpg");
+    let gmlImage = try gmlImage(withName:"burger-224", ofType:"png");
     let classificationResults: TFLClassificationResult = try imageClassifier.classify(gmlImage:gmlImage)
 
     XCTAssertNotNil(classificationResults)
     XCTAssert(classificationResults.classifications.count == 1
                 && classificationResults.classifications[0].categories.count > 0
-                && classificationResults.classifications[0].categories[0].label == "cheeseburger")
+                && classificationResults.classifications[0].categories[0].label == "cheeseburger"
+                && classificationResults.classifications[0].categories[0].score >= 0.70)
 
     }
 
@@ -72,14 +73,15 @@ class TFLImageClassifierTests: XCTestCase {
     let imageClassifier =
       try TFLImageClassifier.imageClassifier(options: imageClassifierOptions!)
 
-    let gmlImage = try gmlImage(withName:"burger_crop", ofType:"jpg");
+    let gmlImage = try gmlImage(withName:"burger-224", ofType:"png");
 
     let classificationResults: TFLClassificationResult = try imageClassifier.classify(gmlImage:gmlImage)
 
     XCTAssertNotNil(classificationResults)
     XCTAssert(classificationResults.classifications.count == 1
-                && classificationResults.classifications[0].categories.count > 0
-                && classificationResults.classifications[0].categories[0].label == "cheeseburger")
+                && classificationResults.classifications[0].categories.count <= maxResults
+                && classificationResults.classifications[0].categories[0].label == "cheeseburger"
+                && classificationResults.classifications[0].categories[0].score >= 0.70)
 
   }
 
@@ -89,14 +91,11 @@ class TFLImageClassifierTests: XCTestCase {
 
     let imageClassifierOptions = TFLImageClassifierOptions(modelPath: modelPath)
     XCTAssertNotNil(imageClassifierOptions)
-
-    let maxResults = 3
-    imageClassifierOptions!.classificationOptions.maxResults = maxResults
 
     let imageClassifier =
       try TFLImageClassifier.imageClassifier(options: imageClassifierOptions!)
 
-    let gmlImage = try gmlImage(withName:"burger_crop", ofType:"jpg");
+    let gmlImage = try gmlImage(withName:"burger-224", ofType:"png");
 
     let roi = CGRect(x: 20, y: 20, width: 200, height: 200)
     let classificationResults =
@@ -105,7 +104,8 @@ class TFLImageClassifierTests: XCTestCase {
     XCTAssertNotNil(classificationResults)
     XCTAssert(classificationResults.classifications.count == 1
                 && classificationResults.classifications[0].categories.count > 0
-                && classificationResults.classifications[0].categories[0].label == "cheeseburger")
+                && classificationResults.classifications[0].categories[0].label == "cheeseburger"
+                && classificationResults.classifications[0].categories[0].score >= 0.90)
 
   }
 
@@ -127,7 +127,8 @@ class TFLImageClassifierTests: XCTestCase {
     XCTAssertNotNil(classificationResults)
     XCTAssert(classificationResults.classifications.count == 1
                 && classificationResults.classifications[0].categories.count > 0
-                && classificationResults.classifications[0].categories[0].label == "junco")
+                && classificationResults.classifications[0].categories[0].label == "junco"
+                && classificationResults.classifications[0].categories[0].score >= 0.25)
 
   }