Ml module imp

CMakeLists.txt

@@ -19,7 +19,7 @@ set(OpenCV_LIBS
     opencv_aruco opencv_core opencv_calib3d opencv_dnn opencv_highgui
     opencv_features2d opencv_gapi opencv_photo opencv_imgproc
     opencv_objdetect opencv_video opencv_videoio opencv_stitching
-    opencv_img_hash opencv_wechat_qrcode
+    opencv_img_hash opencv_wechat_qrcode opencv_ml
 )
 
 if(ANDROID)

conanfile.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 import yaml
 
-OPENCV_VERSION = "4.9.0+2"
+OPENCV_VERSION = "4.9.0+3"
 OPENCV_FILES_URL = (
     f"https://github.com/rainyl/opencv.full/releases/download/{OPENCV_VERSION}"
 )

ffigen.yaml

@@ -29,6 +29,18 @@ headers:
     - src/highgui/highgui.h
     - src/imgcodecs/imgcodecs.h
     - src/imgproc/imgproc.h
+    - src/ml/ml.h
+    - src/ml/train_data.h
+    - src/ml/ann_mlp.h
+    - src/ml/boost.h
+    - src/ml/dtrees.h
+    - src/ml/em.h
+    - src/ml/knearest.h
+    - src/ml/logistic_regression.h
+    - src/ml/normal_bayes_classifier.h
+    - src/ml/rtrees.h
+    - src/ml/svm.h
+    - src/ml/svmsgd.h
     - src/objdetect/objdetect.h
     - src/photo/photo.h
     - src/stitching/stitching.h
@@ -50,6 +62,18 @@ headers:
     - src/highgui/highgui.h
     - src/imgcodecs/imgcodecs.h
     - src/imgproc/imgproc.h
+    - src/ml/ml.h
+    - src/ml/train_data.h
+    - src/ml/svm.h
+    - src/ml/ann_mlp.h
+    - src/ml/boost.h
+    - src/ml/dtrees.h
+    - src/ml/em.h
+    - src/ml/knearest.h
+    - src/ml/logistic_regression.h
+    - src/ml/normal_bayes_classifier.h
+    - src/ml/rtrees.h
+    - src/ml/svmsgd.h
     - src/objdetect/objdetect.h
     - src/photo/photo.h
     - src/stitching/stitching.h

ffigen_const.yaml

@@ -8,9 +8,9 @@ output:
 compiler-opts: ""
 headers:
   entry-points:
-    - src/constants.h
+    - src/core/constants.h
   include-directives:
-    - src/constants.h
+    - src/core/constants.h
 
 preamble: |
   // opencv_dart - OpenCV bindings for Dart language

lib/src/calib3d/calib3d.dart

@@ -10,8 +10,8 @@ import '../core/rect.dart';
 import '../core/base.dart';
 import '../core/mat.dart';
 import '../core/size.dart';
-import '../core/termcriteria.dart';
 import '../constants.g.dart';
+import '../core/termcriteria.dart';
 import '../opencv.g.dart' as cvg;
 
 class Fisheye {
@@ -189,7 +189,7 @@ class Fisheye {
         rvecs!.ref,
         tvecs!.ref,
         flags,
-        criteria.toTermCriteria(arena).ref,
+        criteria.toNativePtr(arena).ref,
         rmsErr,
       ),
     );
@@ -233,19 +233,19 @@ Mat undistortPoints(
   R ??= Mat.empty();
   P ??= Mat.empty();
   dst ??= Mat.empty();
-  cvRunArena(
-    (arena) => cvRun(
+  cvRunArena((arena) {
+    cvRun(
       () => CFFI.UndistortPoints(
         src.ref,
         dst!.ref,
         cameraMatrix.ref,
         distCoeffs.ref,
         R!.ref,
         P!.ref,
-        criteria.toTermCriteria(arena).ref,
+        criteria.toNativePtr(arena).ref,
       ),
-    ),
-  );
+    );
+  });
   return dst;
 }
 

lib/src/constants.g.dart

@@ -2090,3 +2090,17 @@ const int CALIB_ZERO_DISPARITY = 1024;
 const int CALIB_USE_LU = 131072;
 
 const int CALIB_USE_EXTRINSIC_GUESS = 4194304;
+
+const int VAR_NUMERICAL = 0;
+
+const int VAR_ORDERED = 0;
+
+const int VAR_CATEGORICAL = 1;
+
+const int TEST_ERROR = 0;
+
+const int TRAIN_ERROR = 1;
+
+const int ROW_SAMPLE = 0;
+
+const int COL_SAMPLE = 1;

lib/src/core/core.dart

@@ -674,7 +674,7 @@ Mat insertChannel(InputArray src, InputOutputArray dst, int coi) {
   final rval = cvRunArena<double>((arena) {
     final p = arena<ffi.Double>();
     cvRun(
-      () => CFFI.KMeans(data.ref, K, bestLabels.ref, criteria.toTermCriteria(arena).ref, attempts,
+      () => CFFI.KMeans(data.ref, K, bestLabels.ref, criteria.toNativePtr(arena).ref, attempts,
           flags, centers!.ref, p),
     );
     return p.value;
@@ -699,8 +699,8 @@ Mat insertChannel(InputArray src, InputOutputArray dst, int coi) {
   final rval = cvRunArena<double>((arena) {
     final p = arena<ffi.Double>();
     cvRun(
-      () => CFFI.KMeansPoints(pts.ref, K, bestLabels.ref, criteria.toTermCriteria(arena).ref,
-          attempts, flags, centers!.ref, p),
+      () => CFFI.KMeansPoints(pts.ref, K, bestLabels.ref, criteria.toNativePtr(arena).ref, attempts,
+          flags, centers!.ref, p),
     );
     return p.value;
   });

lib/src/core/termcriteria.dart

@@ -1,22 +1,25 @@
-library cv;
-
 import 'dart:ffi' as ffi;
 
 import 'package:ffi/ffi.dart';
-
-import 'base.dart';
 import '../opencv.g.dart' as cvg;
 
 typedef TermCriteria = (int type, int count, double eps);
 
-extension TermCriteriaExtension on TermCriteria {
-  /// TermCriteria is the criteria for iterative algorithms.
-  ///
-  /// For further details, please see:
-  /// https://docs.opencv.org/master/d9/d5d/classcv_1_1TermCriteria.html
-  cvg.TermCriteriaPtr toTermCriteria(Arena arena) {
-    final p = arena<cvg.TermCriteria>();
-    cvRun(() => CFFI.TermCriteria_New($1, $2, $3, p));
-    return p;
+extension TermCriteriaX on TermCriteria {
+  ffi.Pointer<cvg.TermCriteria> toNativePtr(Arena arena) {
+    return arena<cvg.TermCriteria>()
+      ..ref.type = this.$1
+      ..ref.maxCount = this.$2
+      ..ref.epsilon = this.$3;
+  }
+
+  int get type => this.$1;
+  int get count => this.$2;
+  double get eps => this.$3;
+}
+
+extension TermCriteriaX1 on cvg.TermCriteria {
+  TermCriteria toDart() {
+    return (type, maxCount, epsilon);
   }
 }

lib/src/imgproc/imgproc.dart

@@ -700,8 +700,8 @@ VecPoint2f cornerSubPix(
   cvRunArena((arena) {
     final size = winSize.toSize(arena);
     final zone = zeroZone.toSize(arena);
-    final c = criteria.toTermCriteria(arena);
-    cvRun(() => CFFI.CornerSubPix(image.ref, corners.ref, size.ref, zone.ref, c.ref));
+    final tc = criteria.toNativePtr(arena);
+    cvRun(() => CFFI.CornerSubPix(image.ref, corners.ref, size.ref, zone.ref, tc.ref));
   });
   return corners;
 }