mirror of
https://github.com/azaion/detections.git
synced 2026-04-22 11:06:32 +00:00
fix some cython code
This commit is contained in:
+7
-17
@@ -1561,7 +1561,7 @@ struct __pyx_obj_10annotation___pyx_scope_struct__genexpr {
|
||||
|
||||
|
||||
struct __pyx_vtabstruct_10annotation_Detection {
|
||||
PyObject *(*overlaps)(struct __pyx_obj_10annotation_Detection *, struct __pyx_obj_10annotation_Detection *, float);
|
||||
int (*overlaps)(struct __pyx_obj_10annotation_Detection *, struct __pyx_obj_10annotation_Detection *, float);
|
||||
};
|
||||
static struct __pyx_vtabstruct_10annotation_Detection *__pyx_vtabptr_10annotation_Detection;
|
||||
|
||||
@@ -2585,7 +2585,7 @@ static int __Pyx_State_RemoveModule(void*);
|
||||
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
|
||||
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
|
||||
|
||||
PyObject *__pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation_Detection *__pyx_v_self, struct __pyx_obj_10annotation_Detection *__pyx_v_det2, float __pyx_v_confidence_threshold); /* proto*/
|
||||
static int __pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation_Detection *__pyx_v_self, struct __pyx_obj_10annotation_Detection *__pyx_v_det2, float __pyx_v_confidence_threshold); /* proto*/
|
||||
static PyObject *__pyx_f_10annotation_10Annotation_serialize(struct __pyx_obj_10annotation_Annotation *__pyx_v_self); /* proto*/
|
||||
|
||||
/* Module declarations from "constants_inf" */
|
||||
@@ -3471,23 +3471,20 @@ static PyObject *__pyx_pf_10annotation_9Detection_4__eq__(struct __pyx_obj_10ann
|
||||
}
|
||||
|
||||
|
||||
PyObject *__pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation_Detection *__pyx_v_self, struct __pyx_obj_10annotation_Detection *__pyx_v_det2, float __pyx_v_confidence_threshold) {
|
||||
static int __pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation_Detection *__pyx_v_self, struct __pyx_obj_10annotation_Detection *__pyx_v_det2, float __pyx_v_confidence_threshold) {
|
||||
double __pyx_v_overlap_x;
|
||||
double __pyx_v_overlap_y;
|
||||
double __pyx_v_overlap_area;
|
||||
double __pyx_v_min_area;
|
||||
PyObject *__pyx_r = NULL;
|
||||
__Pyx_RefNannyDeclarations
|
||||
int __pyx_r;
|
||||
double __pyx_t_1;
|
||||
double __pyx_t_2;
|
||||
double __pyx_t_3;
|
||||
int __pyx_t_4;
|
||||
double __pyx_t_5;
|
||||
PyObject *__pyx_t_6 = NULL;
|
||||
int __pyx_lineno = 0;
|
||||
const char *__pyx_filename = NULL;
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("overlaps", 0);
|
||||
|
||||
__pyx_t_1 = fabs((__pyx_v_self->x - __pyx_v_det2->x));
|
||||
__pyx_v_overlap_x = ((0.5 * (__pyx_v_self->w + __pyx_v_det2->w)) - __pyx_t_1);
|
||||
@@ -3511,7 +3508,7 @@ PyObject *__pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation
|
||||
} else {
|
||||
__pyx_t_5 = __pyx_t_2;
|
||||
}
|
||||
__pyx_v_overlap_area = (__pyx_t_3 * __pyx_t_5);
|
||||
__pyx_v_overlap_area = ((double)(__pyx_t_3 * __pyx_t_5));
|
||||
|
||||
__pyx_t_5 = (__pyx_v_det2->w * __pyx_v_det2->h);
|
||||
__pyx_t_3 = (__pyx_v_self->w * __pyx_v_self->h);
|
||||
@@ -3523,26 +3520,19 @@ PyObject *__pyx_f_10annotation_9Detection_overlaps(struct __pyx_obj_10annotation
|
||||
}
|
||||
__pyx_v_min_area = __pyx_t_1;
|
||||
|
||||
__Pyx_XDECREF(__pyx_r);
|
||||
if (unlikely(__pyx_v_min_area == 0)) {
|
||||
PyErr_SetString(PyExc_ZeroDivisionError, "float division");
|
||||
__PYX_ERR(0, 34, __pyx_L1_error)
|
||||
}
|
||||
__pyx_t_6 = __Pyx_PyBool_FromLong(((__pyx_v_overlap_area / __pyx_v_min_area) > __pyx_v_confidence_threshold)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 34, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_6);
|
||||
__pyx_r = __pyx_t_6;
|
||||
__pyx_t_6 = 0;
|
||||
__pyx_r = ((__pyx_v_overlap_area / __pyx_v_min_area) > __pyx_v_confidence_threshold);
|
||||
goto __pyx_L0;
|
||||
|
||||
|
||||
/* function exit code */
|
||||
__pyx_L1_error:;
|
||||
__Pyx_XDECREF(__pyx_t_6);
|
||||
__Pyx_AddTraceback("annotation.Detection.overlaps", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
__pyx_r = 0;
|
||||
__pyx_L0:;
|
||||
__Pyx_XGIVEREF(__pyx_r);
|
||||
__Pyx_RefNannyFinishContext();
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
@@ -7169,7 +7159,7 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) {
|
||||
__Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0);
|
||||
/*--- Type init code ---*/
|
||||
__pyx_vtabptr_10annotation_Detection = &__pyx_vtable_10annotation_Detection;
|
||||
__pyx_vtable_10annotation_Detection.overlaps = (PyObject *(*)(struct __pyx_obj_10annotation_Detection *, struct __pyx_obj_10annotation_Detection *, float))__pyx_f_10annotation_9Detection_overlaps;
|
||||
__pyx_vtable_10annotation_Detection.overlaps = (int (*)(struct __pyx_obj_10annotation_Detection *, struct __pyx_obj_10annotation_Detection *, float))__pyx_f_10annotation_9Detection_overlaps;
|
||||
#if CYTHON_USE_TYPE_SPECS
|
||||
__pyx_mstate->__pyx_ptype_10annotation_Detection = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_10annotation_Detection_spec, NULL); if (unlikely(!__pyx_mstate->__pyx_ptype_10annotation_Detection)) __PYX_ERR(0, 4, __pyx_L1_error)
|
||||
if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_10annotation_Detection_spec, __pyx_mstate->__pyx_ptype_10annotation_Detection) < 0) __PYX_ERR(0, 4, __pyx_L1_error)
|
||||
|
||||
Reference in New Issue
Block a user