diff --git a/common/libcommon.a b/common/libcommon.a index 411443397..d8656b177 100644 Binary files a/common/libcommon.a and b/common/libcommon.a differ diff --git a/common/params_pyx.cpp b/common/params_pyx.cpp index de8240f1e..dd98d2ef2 100644 --- a/common/params_pyx.cpp +++ b/common/params_pyx.cpp @@ -1545,7 +1545,7 @@ static const char* const __pyx_f[] = { /*--- Type declarations ---*/ struct __pyx_obj_6common_10params_pyx_Params; -/* "common/params_pyx.pyx":107 +/* "common/params_pyx.pyx":113 * pass * * cdef class Params: # <<<<<<<<<<<<<< @@ -2530,6 +2530,9 @@ static CYTHON_INLINE enum ParamKeyFlag __Pyx_PyLong_As_enum__ParamKeyFlag(PyObje /* CIntToPy.proto */ static CYTHON_INLINE PyObject* __Pyx_PyLong_From_int(int value); +/* CIntToPy.proto */ +static CYTHON_INLINE PyObject* __Pyx_PyLong_From_enum__ParamSettingsTier(enum ParamSettingsTier value); + /* CIntToPy.proto */ static CYTHON_INLINE PyObject* __Pyx_PyLong_From_enum__ParamKeyFlag(enum ParamKeyFlag value); @@ -2707,6 +2710,7 @@ static const char __pyx_k_key[] = "key"; static const char __pyx_k_pop[] = "pop"; static const char __pyx_k_put[] = "put"; static const char __pyx_k_val[] = "val"; +static const char __pyx_k_4r_j[] = "\200!\330\004\013\2104\210r\320\021!\240\021\240$\240j\260\001\260\021"; static const char __pyx_k_AWAQ[] = "\210*\220A\220W\230A\230Q"; static const char __pyx_k_BOOL[] = "BOOL"; static const char __pyx_k_JSON[] = "JSON"; @@ -2840,6 +2844,7 @@ static const char __pyx_k_Params_cpp2python[] = "Params.cpp2python"; static const char __pyx_k_Params_python2cpp[] = "Params.python2cpp"; static const char __pyx_k_common_params_pyx[] = "common.params_pyx"; static const char __pyx_k_get_default_value[] = "get_default_value"; +static const char __pyx_k_get_settings_tier[] = "get_settings_tier"; static const char __pyx_k_Params__cpp2python[] = "Params._cpp2python"; static const char __pyx_k_asyncio_coroutines[] = "asyncio.coroutines"; static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback"; @@ -2857,6 +2862,7 @@ static const char __pyx_k_Params_get_stock_value[] = "Params.get_stock_value"; static const char __pyx_k_Params_put_nonblocking[] = "Params.put_nonblocking"; static const char __pyx_k_Params_get_tuning_level[] = "Params.get_tuning_level"; static const char __pyx_k_Params_get_default_value[] = "Params.get_default_value"; +static const char __pyx_k_Params_get_settings_tier[] = "Params.get_settings_tier"; static const char __pyx_k_openpilot_common_swaglog[] = "openpilot.common.swaglog"; static const char __pyx_k_vS_Q_AQ_k_har_2_PPQ_T_Qc[] = "\200!\330\004\007\200v\210S\220\001\330\006\r\210Q\330\004\005\330\006\r\210\\\230\021\230\"\230A\230Q\330\014\026\220k\240\021\330\006\016\210h\220a\220r\320\0312\260+\320=P\320PQ\330\006\r\210T\220\034\230Q\230c\240\031\250&\260\001"; static const char __pyx_k_CLEAR_ON_ONROAD_TRANSITION[] = "CLEAR_ON_ONROAD_TRANSITION"; @@ -2900,6 +2906,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx static PyObject *__pyx_pf_6common_10params_pyx_6Params_40get_key_flag(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self, PyObject *__pyx_v_key); /* proto */ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self, PyObject *__pyx_v_key); /* proto */ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self, PyObject *__pyx_v_key); /* proto */ +static PyObject *__pyx_pf_6common_10params_pyx_6Params_46get_settings_tier(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self, PyObject *__pyx_v_key); /* proto */ static PyObject *__pyx_tp_new_6common_10params_pyx_Params(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ /* #### Code section: late_includes ### */ /* #### Code section: module_state ### */ @@ -2944,8 +2951,8 @@ typedef struct { __Pyx_CachedCFunction __pyx_umethod_PyDict_Type_pop; PyObject *__pyx_k__2; PyObject *__pyx_tuple[5]; - PyObject *__pyx_codeobj_tab[31]; - PyObject *__pyx_string_tab[160]; + PyObject *__pyx_codeobj_tab[32]; + PyObject *__pyx_string_tab[162]; PyObject *__pyx_int_0; /* #### Code section: module_state_contents ### */ /* CommonTypesMetaclass.module_state_decls */ @@ -3026,124 +3033,126 @@ static __pyx_mstatetype * const __pyx_mstate_global = &__pyx_mstate_global_stati #define __pyx_n_u_Params_get_default_value __pyx_string_tab[39] #define __pyx_n_u_Params_get_key_flag __pyx_string_tab[40] #define __pyx_n_u_Params_get_param_path __pyx_string_tab[41] -#define __pyx_n_u_Params_get_stock_value __pyx_string_tab[42] -#define __pyx_n_u_Params_get_tuning_level __pyx_string_tab[43] -#define __pyx_n_u_Params_get_type __pyx_string_tab[44] -#define __pyx_n_u_Params_put __pyx_string_tab[45] -#define __pyx_n_u_Params_put_bool __pyx_string_tab[46] -#define __pyx_n_u_Params_put_bool_nonblocking __pyx_string_tab[47] -#define __pyx_n_u_Params_put_nonblocking __pyx_string_tab[48] -#define __pyx_n_u_Params_python2cpp __pyx_string_tab[49] -#define __pyx_n_u_Params_remove __pyx_string_tab[50] -#define __pyx_n_u_STRING __pyx_string_tab[51] -#define __pyx_n_u_TIME __pyx_string_tab[52] -#define __pyx_n_u_TypeError __pyx_string_tab[53] -#define __pyx_kp_u_Type_mismatch_while_writing_para __pyx_string_tab[54] -#define __pyx_n_u_UnknownKeyName __pyx_string_tab[55] -#define __pyx_n_u_ValueError __pyx_string_tab[56] -#define __pyx_kp_u__3 __pyx_string_tab[57] -#define __pyx_kp_u__4 __pyx_string_tab[58] -#define __pyx_n_u_all_keys __pyx_string_tab[59] -#define __pyx_n_u_asyncio_coroutines __pyx_string_tab[60] -#define __pyx_n_u_block __pyx_string_tab[61] -#define __pyx_n_u_bool __pyx_string_tab[62] -#define __pyx_n_u_builtins __pyx_string_tab[63] -#define __pyx_n_u_cast __pyx_string_tab[64] -#define __pyx_n_u_check_key __pyx_string_tab[65] -#define __pyx_n_u_class_getitem __pyx_string_tab[66] -#define __pyx_n_u_clear_all __pyx_string_tab[67] -#define __pyx_n_u_cline_in_traceback __pyx_string_tab[68] -#define __pyx_n_u_cloudlog __pyx_string_tab[69] -#define __pyx_n_u_common_params_pyx __pyx_string_tab[70] -#define __pyx_kp_u_common_params_pyx __pyx_string_tab[71] -#define __pyx_kp_u_common_params_pyx_pyx __pyx_string_tab[72] -#define __pyx_n_u_cpp2python __pyx_string_tab[73] -#define __pyx_n_u_cpp2python_2 __pyx_string_tab[74] -#define __pyx_n_u_d __pyx_string_tab[75] -#define __pyx_n_u_dat __pyx_string_tab[76] -#define __pyx_n_u_dat_bytes __pyx_string_tab[77] -#define __pyx_n_u_datetime __pyx_string_tab[78] -#define __pyx_n_u_decode __pyx_string_tab[79] -#define __pyx_n_u_decode_int __pyx_string_tab[80] -#define __pyx_n_u_decode_time __pyx_string_tab[81] -#define __pyx_n_u_decoded __pyx_string_tab[82] -#define __pyx_n_u_default __pyx_string_tab[83] -#define __pyx_n_u_default_val __pyx_string_tab[84] -#define __pyx_kp_u_disable __pyx_string_tab[85] -#define __pyx_n_u_doc __pyx_string_tab[86] -#define __pyx_n_u_dumps __pyx_string_tab[87] -#define __pyx_kp_u_enable __pyx_string_tab[88] -#define __pyx_n_u_encode __pyx_string_tab[89] -#define __pyx_n_u_ensure_bytes __pyx_string_tab[90] -#define __pyx_n_u_enum __pyx_string_tab[91] -#define __pyx_n_u_expected_type __pyx_string_tab[92] -#define __pyx_kp_u_expected_type_2 __pyx_string_tab[93] -#define __pyx_n_u_fmt __pyx_string_tab[94] -#define __pyx_kp_u_from_type_t __pyx_string_tab[95] -#define __pyx_n_u_fromisoformat __pyx_string_tab[96] -#define __pyx_n_u_func __pyx_string_tab[97] -#define __pyx_kp_u_gc __pyx_string_tab[98] -#define __pyx_n_u_get __pyx_string_tab[99] -#define __pyx_n_u_get_bool __pyx_string_tab[100] -#define __pyx_n_u_get_default_value __pyx_string_tab[101] -#define __pyx_n_u_get_key_flag __pyx_string_tab[102] -#define __pyx_n_u_get_param_path __pyx_string_tab[103] -#define __pyx_n_u_get_stock_value __pyx_string_tab[104] -#define __pyx_n_u_get_tuning_level __pyx_string_tab[105] -#define __pyx_n_u_get_type __pyx_string_tab[106] -#define __pyx_n_u_initializing __pyx_string_tab[107] -#define __pyx_n_u_is_coroutine __pyx_string_tab[108] -#define __pyx_kp_u_isenabled __pyx_string_tab[109] -#define __pyx_n_u_isoformat __pyx_string_tab[110] -#define __pyx_n_u_json __pyx_string_tab[111] -#define __pyx_n_u_k __pyx_string_tab[112] -#define __pyx_n_u_key __pyx_string_tab[113] -#define __pyx_n_u_key_bytes __pyx_string_tab[114] -#define __pyx_n_u_lambda __pyx_string_tab[115] -#define __pyx_n_u_level __pyx_string_tab[116] -#define __pyx_n_u_loads __pyx_string_tab[117] -#define __pyx_n_u_main __pyx_string_tab[118] -#define __pyx_n_u_member_names __pyx_string_tab[119] -#define __pyx_n_u_members __pyx_string_tab[120] -#define __pyx_n_u_memory __pyx_string_tab[121] -#define __pyx_n_u_metaclass __pyx_string_tab[122] -#define __pyx_n_u_module __pyx_string_tab[123] -#define __pyx_n_u_module_2 __pyx_string_tab[124] -#define __pyx_n_u_mro_entries __pyx_string_tab[125] -#define __pyx_n_u_name __pyx_string_tab[126] -#define __pyx_n_u_openpilot_common_swaglog __pyx_string_tab[127] -#define __pyx_n_u_pop __pyx_string_tab[128] -#define __pyx_n_u_prepare __pyx_string_tab[129] -#define __pyx_n_u_proposed_type __pyx_string_tab[130] -#define __pyx_kp_u_proposed_type_2 __pyx_string_tab[131] -#define __pyx_n_u_put __pyx_string_tab[132] -#define __pyx_n_u_put_bool __pyx_string_tab[133] -#define __pyx_n_u_put_bool_nonblocking __pyx_string_tab[134] -#define __pyx_n_u_put_cast __pyx_string_tab[135] -#define __pyx_n_u_put_nonblocking __pyx_string_tab[136] -#define __pyx_n_u_python2cpp __pyx_string_tab[137] -#define __pyx_n_u_qualname __pyx_string_tab[138] -#define __pyx_n_u_r __pyx_string_tab[139] -#define __pyx_n_u_range __pyx_string_tab[140] -#define __pyx_n_u_reduce __pyx_string_tab[141] -#define __pyx_n_u_remove __pyx_string_tab[142] -#define __pyx_n_u_return_default __pyx_string_tab[143] -#define __pyx_n_u_return_defaults __pyx_string_tab[144] -#define __pyx_n_u_self __pyx_string_tab[145] -#define __pyx_n_u_set_name __pyx_string_tab[146] -#define __pyx_n_u_spec __pyx_string_tab[147] -#define __pyx_n_u_stock __pyx_string_tab[148] -#define __pyx_n_u_strptime __pyx_string_tab[149] -#define __pyx_n_u_t __pyx_string_tab[150] -#define __pyx_n_u_test __pyx_string_tab[151] -#define __pyx_n_u_tx_flag __pyx_string_tab[152] -#define __pyx_kp_u_utf_8 __pyx_string_tab[153] -#define __pyx_n_u_v __pyx_string_tab[154] -#define __pyx_n_u_val __pyx_string_tab[155] -#define __pyx_n_u_value __pyx_string_tab[156] -#define __pyx_kp_u_value_2 __pyx_string_tab[157] -#define __pyx_n_u_warning __pyx_string_tab[158] -#define __pyx_kp_u_with_value __pyx_string_tab[159] +#define __pyx_n_u_Params_get_settings_tier __pyx_string_tab[42] +#define __pyx_n_u_Params_get_stock_value __pyx_string_tab[43] +#define __pyx_n_u_Params_get_tuning_level __pyx_string_tab[44] +#define __pyx_n_u_Params_get_type __pyx_string_tab[45] +#define __pyx_n_u_Params_put __pyx_string_tab[46] +#define __pyx_n_u_Params_put_bool __pyx_string_tab[47] +#define __pyx_n_u_Params_put_bool_nonblocking __pyx_string_tab[48] +#define __pyx_n_u_Params_put_nonblocking __pyx_string_tab[49] +#define __pyx_n_u_Params_python2cpp __pyx_string_tab[50] +#define __pyx_n_u_Params_remove __pyx_string_tab[51] +#define __pyx_n_u_STRING __pyx_string_tab[52] +#define __pyx_n_u_TIME __pyx_string_tab[53] +#define __pyx_n_u_TypeError __pyx_string_tab[54] +#define __pyx_kp_u_Type_mismatch_while_writing_para __pyx_string_tab[55] +#define __pyx_n_u_UnknownKeyName __pyx_string_tab[56] +#define __pyx_n_u_ValueError __pyx_string_tab[57] +#define __pyx_kp_u__3 __pyx_string_tab[58] +#define __pyx_kp_u__4 __pyx_string_tab[59] +#define __pyx_n_u_all_keys __pyx_string_tab[60] +#define __pyx_n_u_asyncio_coroutines __pyx_string_tab[61] +#define __pyx_n_u_block __pyx_string_tab[62] +#define __pyx_n_u_bool __pyx_string_tab[63] +#define __pyx_n_u_builtins __pyx_string_tab[64] +#define __pyx_n_u_cast __pyx_string_tab[65] +#define __pyx_n_u_check_key __pyx_string_tab[66] +#define __pyx_n_u_class_getitem __pyx_string_tab[67] +#define __pyx_n_u_clear_all __pyx_string_tab[68] +#define __pyx_n_u_cline_in_traceback __pyx_string_tab[69] +#define __pyx_n_u_cloudlog __pyx_string_tab[70] +#define __pyx_n_u_common_params_pyx __pyx_string_tab[71] +#define __pyx_kp_u_common_params_pyx __pyx_string_tab[72] +#define __pyx_kp_u_common_params_pyx_pyx __pyx_string_tab[73] +#define __pyx_n_u_cpp2python __pyx_string_tab[74] +#define __pyx_n_u_cpp2python_2 __pyx_string_tab[75] +#define __pyx_n_u_d __pyx_string_tab[76] +#define __pyx_n_u_dat __pyx_string_tab[77] +#define __pyx_n_u_dat_bytes __pyx_string_tab[78] +#define __pyx_n_u_datetime __pyx_string_tab[79] +#define __pyx_n_u_decode __pyx_string_tab[80] +#define __pyx_n_u_decode_int __pyx_string_tab[81] +#define __pyx_n_u_decode_time __pyx_string_tab[82] +#define __pyx_n_u_decoded __pyx_string_tab[83] +#define __pyx_n_u_default __pyx_string_tab[84] +#define __pyx_n_u_default_val __pyx_string_tab[85] +#define __pyx_kp_u_disable __pyx_string_tab[86] +#define __pyx_n_u_doc __pyx_string_tab[87] +#define __pyx_n_u_dumps __pyx_string_tab[88] +#define __pyx_kp_u_enable __pyx_string_tab[89] +#define __pyx_n_u_encode __pyx_string_tab[90] +#define __pyx_n_u_ensure_bytes __pyx_string_tab[91] +#define __pyx_n_u_enum __pyx_string_tab[92] +#define __pyx_n_u_expected_type __pyx_string_tab[93] +#define __pyx_kp_u_expected_type_2 __pyx_string_tab[94] +#define __pyx_n_u_fmt __pyx_string_tab[95] +#define __pyx_kp_u_from_type_t __pyx_string_tab[96] +#define __pyx_n_u_fromisoformat __pyx_string_tab[97] +#define __pyx_n_u_func __pyx_string_tab[98] +#define __pyx_kp_u_gc __pyx_string_tab[99] +#define __pyx_n_u_get __pyx_string_tab[100] +#define __pyx_n_u_get_bool __pyx_string_tab[101] +#define __pyx_n_u_get_default_value __pyx_string_tab[102] +#define __pyx_n_u_get_key_flag __pyx_string_tab[103] +#define __pyx_n_u_get_param_path __pyx_string_tab[104] +#define __pyx_n_u_get_settings_tier __pyx_string_tab[105] +#define __pyx_n_u_get_stock_value __pyx_string_tab[106] +#define __pyx_n_u_get_tuning_level __pyx_string_tab[107] +#define __pyx_n_u_get_type __pyx_string_tab[108] +#define __pyx_n_u_initializing __pyx_string_tab[109] +#define __pyx_n_u_is_coroutine __pyx_string_tab[110] +#define __pyx_kp_u_isenabled __pyx_string_tab[111] +#define __pyx_n_u_isoformat __pyx_string_tab[112] +#define __pyx_n_u_json __pyx_string_tab[113] +#define __pyx_n_u_k __pyx_string_tab[114] +#define __pyx_n_u_key __pyx_string_tab[115] +#define __pyx_n_u_key_bytes __pyx_string_tab[116] +#define __pyx_n_u_lambda __pyx_string_tab[117] +#define __pyx_n_u_level __pyx_string_tab[118] +#define __pyx_n_u_loads __pyx_string_tab[119] +#define __pyx_n_u_main __pyx_string_tab[120] +#define __pyx_n_u_member_names __pyx_string_tab[121] +#define __pyx_n_u_members __pyx_string_tab[122] +#define __pyx_n_u_memory __pyx_string_tab[123] +#define __pyx_n_u_metaclass __pyx_string_tab[124] +#define __pyx_n_u_module __pyx_string_tab[125] +#define __pyx_n_u_module_2 __pyx_string_tab[126] +#define __pyx_n_u_mro_entries __pyx_string_tab[127] +#define __pyx_n_u_name __pyx_string_tab[128] +#define __pyx_n_u_openpilot_common_swaglog __pyx_string_tab[129] +#define __pyx_n_u_pop __pyx_string_tab[130] +#define __pyx_n_u_prepare __pyx_string_tab[131] +#define __pyx_n_u_proposed_type __pyx_string_tab[132] +#define __pyx_kp_u_proposed_type_2 __pyx_string_tab[133] +#define __pyx_n_u_put __pyx_string_tab[134] +#define __pyx_n_u_put_bool __pyx_string_tab[135] +#define __pyx_n_u_put_bool_nonblocking __pyx_string_tab[136] +#define __pyx_n_u_put_cast __pyx_string_tab[137] +#define __pyx_n_u_put_nonblocking __pyx_string_tab[138] +#define __pyx_n_u_python2cpp __pyx_string_tab[139] +#define __pyx_n_u_qualname __pyx_string_tab[140] +#define __pyx_n_u_r __pyx_string_tab[141] +#define __pyx_n_u_range __pyx_string_tab[142] +#define __pyx_n_u_reduce __pyx_string_tab[143] +#define __pyx_n_u_remove __pyx_string_tab[144] +#define __pyx_n_u_return_default __pyx_string_tab[145] +#define __pyx_n_u_return_defaults __pyx_string_tab[146] +#define __pyx_n_u_self __pyx_string_tab[147] +#define __pyx_n_u_set_name __pyx_string_tab[148] +#define __pyx_n_u_spec __pyx_string_tab[149] +#define __pyx_n_u_stock __pyx_string_tab[150] +#define __pyx_n_u_strptime __pyx_string_tab[151] +#define __pyx_n_u_t __pyx_string_tab[152] +#define __pyx_n_u_test __pyx_string_tab[153] +#define __pyx_n_u_tx_flag __pyx_string_tab[154] +#define __pyx_kp_u_utf_8 __pyx_string_tab[155] +#define __pyx_n_u_v __pyx_string_tab[156] +#define __pyx_n_u_val __pyx_string_tab[157] +#define __pyx_n_u_value __pyx_string_tab[158] +#define __pyx_kp_u_value_2 __pyx_string_tab[159] +#define __pyx_n_u_warning __pyx_string_tab[160] +#define __pyx_kp_u_with_value __pyx_string_tab[161] /* #### Code section: module_state_clear ### */ #if CYTHON_USE_MODULE_STATE static CYTHON_SMALL_CODE int __pyx_m_clear(PyObject *m) { @@ -3168,8 +3177,8 @@ static CYTHON_SMALL_CODE int __pyx_m_clear(PyObject *m) { Py_CLEAR(clear_module_state->__pyx_type_6common_10params_pyx_Params); Py_CLEAR(clear_module_state->__pyx_k__2); for (int i=0; i<5; ++i) { Py_CLEAR(clear_module_state->__pyx_tuple[i]); } - for (int i=0; i<31; ++i) { Py_CLEAR(clear_module_state->__pyx_codeobj_tab[i]); } - for (int i=0; i<160; ++i) { Py_CLEAR(clear_module_state->__pyx_string_tab[i]); } + for (int i=0; i<32; ++i) { Py_CLEAR(clear_module_state->__pyx_codeobj_tab[i]); } + for (int i=0; i<162; ++i) { Py_CLEAR(clear_module_state->__pyx_string_tab[i]); } Py_CLEAR(clear_module_state->__pyx_int_0); return 0; } @@ -3195,15 +3204,15 @@ static CYTHON_SMALL_CODE int __pyx_m_traverse(PyObject *m, visitproc visit, void Py_VISIT(traverse_module_state->__pyx_type_6common_10params_pyx_Params); Py_VISIT(traverse_module_state->__pyx_k__2); for (int i=0; i<5; ++i) { __Pyx_VISIT_CONST(traverse_module_state->__pyx_tuple[i]); } - for (int i=0; i<31; ++i) { __Pyx_VISIT_CONST(traverse_module_state->__pyx_codeobj_tab[i]); } - for (int i=0; i<160; ++i) { __Pyx_VISIT_CONST(traverse_module_state->__pyx_string_tab[i]); } + for (int i=0; i<32; ++i) { __Pyx_VISIT_CONST(traverse_module_state->__pyx_codeobj_tab[i]); } + for (int i=0; i<162; ++i) { __Pyx_VISIT_CONST(traverse_module_state->__pyx_string_tab[i]); } __Pyx_VISIT_CONST(traverse_module_state->__pyx_int_0); return 0; } #endif /* #### Code section: module_code ### */ -/* "common/params_pyx.pyx":59 +/* "common/params_pyx.pyx":65 * * PYTHON_2_CPP = { * (str, STRING): lambda v: v, # <<<<<<<<<<<<<< @@ -3250,32 +3259,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 59, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 65, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 59, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 65, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda", 0) < 0) __PYX_ERR(0, 59, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda", 0) < 0) __PYX_ERR(0, 65, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda", 1, 1, 1, i); __PYX_ERR(0, 59, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda", 1, 1, 1, i); __PYX_ERR(0, 65, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 59, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 65, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 59, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 65, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3312,7 +3321,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":60 +/* "common/params_pyx.pyx":66 * PYTHON_2_CPP = { * (str, STRING): lambda v: v, * (builtins.bool, BOOL): lambda v: "1" if v else "0", # <<<<<<<<<<<<<< @@ -3359,32 +3368,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 60, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 66, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 60, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 66, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda1", 0) < 0) __PYX_ERR(0, 60, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda1", 0) < 0) __PYX_ERR(0, 66, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda1", 1, 1, 1, i); __PYX_ERR(0, 60, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda1", 1, 1, 1, i); __PYX_ERR(0, 66, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 60, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 66, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda1", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 60, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda1", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 66, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3415,7 +3424,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda1(CYTHON_UNUSED int __pyx_clineno = 0; __Pyx_RefNannySetupContext("lambda1", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_v); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 60, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_v); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 66, __pyx_L1_error) if (__pyx_t_2) { __Pyx_INCREF(__pyx_mstate_global->__pyx_kp_u_1); __pyx_t_1 = __pyx_mstate_global->__pyx_kp_u_1; @@ -3438,7 +3447,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda1(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":63 +/* "common/params_pyx.pyx":69 * (int, INT): str, * (float, FLOAT): str, * (datetime.datetime, TIME): lambda v: v.isoformat(), # <<<<<<<<<<<<<< @@ -3485,32 +3494,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 63, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 69, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 63, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 69, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda2", 0) < 0) __PYX_ERR(0, 63, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda2", 0) < 0) __PYX_ERR(0, 69, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda2", 1, 1, 1, i); __PYX_ERR(0, 63, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda2", 1, 1, 1, i); __PYX_ERR(0, 69, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 63, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 69, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda2", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 63, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda2", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 69, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3549,7 +3558,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda2(CYTHON_UNUSED PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_isoformat, __pyx_callargs+__pyx_t_3, (1-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 63, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; @@ -3568,7 +3577,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda2(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":66 +/* "common/params_pyx.pyx":72 * (dict, JSON): json.dumps, * (list, JSON): json.dumps, * (bytes, BYTES): lambda v: v, # <<<<<<<<<<<<<< @@ -3615,32 +3624,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 66, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 72, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 66, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 72, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda3", 0) < 0) __PYX_ERR(0, 66, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda3", 0) < 0) __PYX_ERR(0, 72, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda3", 1, 1, 1, i); __PYX_ERR(0, 66, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda3", 1, 1, 1, i); __PYX_ERR(0, 72, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 66, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 72, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda3", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 66, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda3", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 72, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3677,7 +3686,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda3(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":92 +/* "common/params_pyx.pyx":98 * * CPP_2_PYTHON = { * STRING: lambda v: v.decode("utf-8"), # <<<<<<<<<<<<<< @@ -3724,32 +3733,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 92, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 98, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 92, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 98, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda4", 0) < 0) __PYX_ERR(0, 92, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda4", 0) < 0) __PYX_ERR(0, 98, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda4", 1, 1, 1, i); __PYX_ERR(0, 92, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda4", 1, 1, 1, i); __PYX_ERR(0, 98, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 92, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 98, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda4", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 92, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda4", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 98, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3788,7 +3797,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda4(CYTHON_UNUSED PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_mstate_global->__pyx_kp_u_utf_8}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_decode, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 92, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; @@ -3807,7 +3816,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda4(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":93 +/* "common/params_pyx.pyx":99 * CPP_2_PYTHON = { * STRING: lambda v: v.decode("utf-8"), * BOOL: lambda v: v == b"1", # <<<<<<<<<<<<<< @@ -3854,32 +3863,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 93, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 99, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 93, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 99, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda5", 0) < 0) __PYX_ERR(0, 93, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda5", 0) < 0) __PYX_ERR(0, 99, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda5", 1, 1, 1, i); __PYX_ERR(0, 93, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda5", 1, 1, 1, i); __PYX_ERR(0, 99, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 93, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 99, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda5", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 93, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda5", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 99, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -3909,7 +3918,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda5(CYTHON_UNUSED int __pyx_clineno = 0; __Pyx_RefNannySetupContext("lambda5", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyObject_RichCompare(__pyx_v_v, __pyx_mstate_global->__pyx_kp_b_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(__pyx_v_v, __pyx_mstate_global->__pyx_kp_b_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 99, __pyx_L1_error) __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; @@ -3925,7 +3934,7 @@ static PyObject *__pyx_lambda_funcdef_6common_10params_pyx_lambda5(CYTHON_UNUSED return __pyx_r; } -/* "common/params_pyx.pyx":98 +/* "common/params_pyx.pyx":104 * TIME: _decode_time, * JSON: json.loads, * BYTES: lambda v: v, # <<<<<<<<<<<<<< @@ -3972,32 +3981,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 98, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 104, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 98, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 104, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda6", 0) < 0) __PYX_ERR(0, 98, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "lambda6", 0) < 0) __PYX_ERR(0, 104, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda6", 1, 1, 1, i); __PYX_ERR(0, 98, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("lambda6", 1, 1, 1, i); __PYX_ERR(0, 104, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 98, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 104, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("lambda6", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 98, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("lambda6", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 104, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -5150,7 +5159,7 @@ static PyObject *__pyx_convert_vector_to_py_std_3a__3a_string(std::vector__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 70, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 76, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 70, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 76, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_decode_int", 0) < 0) __PYX_ERR(0, 70, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_decode_int", 0) < 0) __PYX_ERR(0, 76, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_decode_int", 1, 1, 1, i); __PYX_ERR(0, 70, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_decode_int", 1, 1, 1, i); __PYX_ERR(0, 76, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 70, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 76, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("_decode_int", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 70, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("_decode_int", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 76, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -5262,7 +5271,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_decode_int", 0); - /* "common/params_pyx.pyx":71 + /* "common/params_pyx.pyx":77 * * def _decode_int(v): * decoded = v.decode("utf-8") # <<<<<<<<<<<<<< @@ -5276,13 +5285,13 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_mstate_global->__pyx_kp_u_utf_8}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_decode, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 71, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 77, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_v_decoded = __pyx_t_1; __pyx_t_1 = 0; - /* "common/params_pyx.pyx":72 + /* "common/params_pyx.pyx":78 * def _decode_int(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5298,7 +5307,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec __Pyx_XGOTREF(__pyx_t_6); /*try:*/ { - /* "common/params_pyx.pyx":73 + /* "common/params_pyx.pyx":79 * decoded = v.decode("utf-8") * try: * return int(decoded) # <<<<<<<<<<<<<< @@ -5306,13 +5315,13 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec * return int(float(decoded)) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyNumber_Int(__pyx_v_decoded); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 73, __pyx_L3_error) + __pyx_t_1 = __Pyx_PyNumber_Int(__pyx_v_decoded); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L7_try_return; - /* "common/params_pyx.pyx":72 + /* "common/params_pyx.pyx":78 * def _decode_int(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5324,7 +5333,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "common/params_pyx.pyx":74 + /* "common/params_pyx.pyx":80 * try: * return int(decoded) * except ValueError: # <<<<<<<<<<<<<< @@ -5334,12 +5343,12 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec __pyx_t_7 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_ValueError); if (__pyx_t_7) { __Pyx_AddTraceback("common.params_pyx._decode_int", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_2, &__pyx_t_8) < 0) __PYX_ERR(0, 74, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_2, &__pyx_t_8) < 0) __PYX_ERR(0, 80, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_2); __Pyx_XGOTREF(__pyx_t_8); - /* "common/params_pyx.pyx":75 + /* "common/params_pyx.pyx":81 * return int(decoded) * except ValueError: * return int(float(decoded)) # <<<<<<<<<<<<<< @@ -5347,9 +5356,9 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_9 = __Pyx_PyNumber_Float(__pyx_v_decoded); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 75, __pyx_L5_except_error) + __pyx_t_9 = __Pyx_PyNumber_Float(__pyx_v_decoded); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 81, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_10 = __Pyx_PyNumber_Int(__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 75, __pyx_L5_except_error) + __pyx_t_10 = __Pyx_PyNumber_Int(__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 81, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_r = __pyx_t_10; @@ -5361,7 +5370,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec } goto __pyx_L5_except_error; - /* "common/params_pyx.pyx":72 + /* "common/params_pyx.pyx":78 * def _decode_int(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5388,7 +5397,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec goto __pyx_L0; } - /* "common/params_pyx.pyx":70 + /* "common/params_pyx.pyx":76 * * * def _decode_int(v): # <<<<<<<<<<<<<< @@ -5412,7 +5421,7 @@ static PyObject *__pyx_pf_6common_10params_pyx__decode_int(CYTHON_UNUSED PyObjec return __pyx_r; } -/* "common/params_pyx.pyx":78 +/* "common/params_pyx.pyx":84 * * * def _decode_time(v): # <<<<<<<<<<<<<< @@ -5459,32 +5468,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 78, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 84, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 78, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 84, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_decode_time", 0) < 0) __PYX_ERR(0, 78, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_decode_time", 0) < 0) __PYX_ERR(0, 84, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_decode_time", 1, 1, 1, i); __PYX_ERR(0, 78, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_decode_time", 1, 1, 1, i); __PYX_ERR(0, 84, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 78, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 84, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("_decode_time", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 78, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("_decode_time", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 84, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -5532,7 +5541,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_decode_time", 0); - /* "common/params_pyx.pyx":79 + /* "common/params_pyx.pyx":85 * * def _decode_time(v): * decoded = v.decode("utf-8") # <<<<<<<<<<<<<< @@ -5546,13 +5555,13 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_mstate_global->__pyx_kp_u_utf_8}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_decode, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 85, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_v_decoded = __pyx_t_1; __pyx_t_1 = 0; - /* "common/params_pyx.pyx":80 + /* "common/params_pyx.pyx":86 * def _decode_time(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5568,7 +5577,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_XGOTREF(__pyx_t_6); /*try:*/ { - /* "common/params_pyx.pyx":81 + /* "common/params_pyx.pyx":87 * decoded = v.decode("utf-8") * try: * return datetime.datetime.fromisoformat(decoded) # <<<<<<<<<<<<<< @@ -5576,9 +5585,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): */ __Pyx_XDECREF(__pyx_r); - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 81, __pyx_L3_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 87, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 81, __pyx_L3_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 87, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_2 = __pyx_t_8; @@ -5589,14 +5598,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_fromisoformat, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 81, __pyx_L3_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 87, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L7_try_return; - /* "common/params_pyx.pyx":80 + /* "common/params_pyx.pyx":86 * def _decode_time(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5610,7 +5619,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "common/params_pyx.pyx":82 + /* "common/params_pyx.pyx":88 * try: * return datetime.datetime.fromisoformat(decoded) * except ValueError: # <<<<<<<<<<<<<< @@ -5620,12 +5629,12 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __pyx_t_9 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_ValueError); if (__pyx_t_9) { __Pyx_AddTraceback("common.params_pyx._decode_time", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_8, &__pyx_t_2) < 0) __PYX_ERR(0, 82, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_8, &__pyx_t_2) < 0) __PYX_ERR(0, 88, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_8); __Pyx_XGOTREF(__pyx_t_2); - /* "common/params_pyx.pyx":83 + /* "common/params_pyx.pyx":89 * return datetime.datetime.fromisoformat(decoded) * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): # <<<<<<<<<<<<<< @@ -5642,12 +5651,12 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __pyx_t_11 = __Pyx_PySequence_ITEM(__pyx_t_7, __pyx_t_10); #endif ++__pyx_t_10; - if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 83, __pyx_L5_except_error) + if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 89, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_XDECREF_SET(__pyx_v_fmt, ((PyObject*)__pyx_t_11)); __pyx_t_11 = 0; - /* "common/params_pyx.pyx":84 + /* "common/params_pyx.pyx":90 * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): * try: # <<<<<<<<<<<<<< @@ -5663,7 +5672,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_XGOTREF(__pyx_t_14); /*try:*/ { - /* "common/params_pyx.pyx":85 + /* "common/params_pyx.pyx":91 * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): * try: * return datetime.datetime.strptime(decoded, fmt) # <<<<<<<<<<<<<< @@ -5671,9 +5680,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj * pass */ __Pyx_XDECREF(__pyx_r); - __Pyx_GetModuleGlobalName(__pyx_t_16, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 85, __pyx_L13_error) + __Pyx_GetModuleGlobalName(__pyx_t_16, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 91, __pyx_L13_error) __Pyx_GOTREF(__pyx_t_16); - __pyx_t_17 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_17)) __PYX_ERR(0, 85, __pyx_L13_error) + __pyx_t_17 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_17)) __PYX_ERR(0, 91, __pyx_L13_error) __Pyx_GOTREF(__pyx_t_17); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; __pyx_t_15 = __pyx_t_17; @@ -5684,7 +5693,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __pyx_t_11 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_strptime, __pyx_callargs+__pyx_t_3, (3-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0; __Pyx_DECREF(__pyx_t_17); __pyx_t_17 = 0; - if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 85, __pyx_L13_error) + if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 91, __pyx_L13_error) __Pyx_GOTREF(__pyx_t_11); } __pyx_r = __pyx_t_11; @@ -5695,7 +5704,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L17_try_return; - /* "common/params_pyx.pyx":84 + /* "common/params_pyx.pyx":90 * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): * try: # <<<<<<<<<<<<<< @@ -5709,7 +5718,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_XDECREF(__pyx_t_16); __pyx_t_16 = 0; __Pyx_XDECREF(__pyx_t_17); __pyx_t_17 = 0; - /* "common/params_pyx.pyx":86 + /* "common/params_pyx.pyx":92 * try: * return datetime.datetime.strptime(decoded, fmt) * except ValueError: # <<<<<<<<<<<<<< @@ -5723,7 +5732,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj } goto __pyx_L15_except_error; - /* "common/params_pyx.pyx":84 + /* "common/params_pyx.pyx":90 * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): * try: # <<<<<<<<<<<<<< @@ -5749,7 +5758,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_ExceptionReset(__pyx_t_12, __pyx_t_13, __pyx_t_14); } - /* "common/params_pyx.pyx":83 + /* "common/params_pyx.pyx":89 * return datetime.datetime.fromisoformat(decoded) * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): # <<<<<<<<<<<<<< @@ -5759,7 +5768,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "common/params_pyx.pyx":88 + /* "common/params_pyx.pyx":94 * except ValueError: * pass * raise # <<<<<<<<<<<<<< @@ -5771,11 +5780,11 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj __Pyx_XGIVEREF(__pyx_t_2); __Pyx_ErrRestoreWithState(__pyx_t_1, __pyx_t_8, __pyx_t_2); __pyx_t_1 = 0; __pyx_t_8 = 0; __pyx_t_2 = 0; - __PYX_ERR(0, 88, __pyx_L5_except_error) + __PYX_ERR(0, 94, __pyx_L5_except_error) } goto __pyx_L5_except_error; - /* "common/params_pyx.pyx":80 + /* "common/params_pyx.pyx":86 * def _decode_time(v): * decoded = v.decode("utf-8") * try: # <<<<<<<<<<<<<< @@ -5802,7 +5811,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj goto __pyx_L0; } - /* "common/params_pyx.pyx":78 + /* "common/params_pyx.pyx":84 * * * def _decode_time(v): # <<<<<<<<<<<<<< @@ -5830,7 +5839,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_2_decode_time(CYTHON_UNUSED PyObj return __pyx_r; } -/* "common/params_pyx.pyx":101 +/* "common/params_pyx.pyx":107 * } * * def ensure_bytes(v): # <<<<<<<<<<<<<< @@ -5877,32 +5886,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_v,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 101, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 107, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 101, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 107, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "ensure_bytes", 0) < 0) __PYX_ERR(0, 101, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "ensure_bytes", 0) < 0) __PYX_ERR(0, 107, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("ensure_bytes", 1, 1, 1, i); __PYX_ERR(0, 101, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("ensure_bytes", 1, 1, 1, i); __PYX_ERR(0, 107, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 101, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 107, __pyx_L3_error) } __pyx_v_v = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("ensure_bytes", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 101, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("ensure_bytes", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 107, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -5936,7 +5945,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_4ensure_bytes(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("ensure_bytes", 0); - /* "common/params_pyx.pyx":102 + /* "common/params_pyx.pyx":108 * * def ensure_bytes(v): * return v.encode() if isinstance(v, str) else v # <<<<<<<<<<<<<< @@ -5953,7 +5962,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_4ensure_bytes(CYTHON_UNUSED PyObj PyObject *__pyx_callargs[2] = {__pyx_t_4, NULL}; __pyx_t_3 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_encode, __pyx_callargs+__pyx_t_5, (1-__pyx_t_5) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); } __pyx_t_1 = __pyx_t_3; @@ -5966,7 +5975,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_4ensure_bytes(CYTHON_UNUSED PyObj __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":101 + /* "common/params_pyx.pyx":107 * } * * def ensure_bytes(v): # <<<<<<<<<<<<<< @@ -5987,7 +5996,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_4ensure_bytes(CYTHON_UNUSED PyObj return __pyx_r; } -/* "common/params_pyx.pyx":115 +/* "common/params_pyx.pyx":121 * cdef bool return_defaults * * def __cinit__(self, d="", *, memory=False, return_defaults=False): # <<<<<<<<<<<<<< @@ -6019,18 +6028,18 @@ static int __pyx_pw_6common_10params_pyx_6Params_1__cinit__(PyObject *__pyx_v_se { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_d,&__pyx_mstate_global->__pyx_n_u_memory,&__pyx_mstate_global->__pyx_n_u_return_defaults,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_VARARGS(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 115, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 121, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_VARARGS(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 115, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 121, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < 0) __PYX_ERR(0, 115, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < 0) __PYX_ERR(0, 121, __pyx_L3_error) if (!values[0]) values[0] = __Pyx_NewRef(((PyObject *)__pyx_mstate_global->__pyx_kp_u_)); if (!values[1]) values[1] = __Pyx_NewRef(((PyObject *)Py_False)); if (!values[2]) values[2] = __Pyx_NewRef(((PyObject *)Py_False)); @@ -6038,7 +6047,7 @@ static int __pyx_pw_6common_10params_pyx_6Params_1__cinit__(PyObject *__pyx_v_se switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_VARARGS(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 115, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 121, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; @@ -6053,7 +6062,7 @@ static int __pyx_pw_6common_10params_pyx_6Params_1__cinit__(PyObject *__pyx_v_se } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("__cinit__", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 115, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("__cinit__", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 121, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -6092,7 +6101,7 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__cinit__", 0); - /* "common/params_pyx.pyx":116 + /* "common/params_pyx.pyx":122 * * def __cinit__(self, d="", *, memory=False, return_defaults=False): * cdef string path = d.encode() # <<<<<<<<<<<<<< @@ -6106,24 +6115,24 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_encode, __pyx_callargs+__pyx_t_3, (1-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 116, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 122, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_path = ((std::string)__pyx_t_4); - /* "common/params_pyx.pyx":119 + /* "common/params_pyx.pyx":125 * * # StarPilot variables * cdef bool c_memory = memory # <<<<<<<<<<<<<< * * with nogil: */ - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_5 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_5 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L1_error) __pyx_v_c_memory = __pyx_t_5; - /* "common/params_pyx.pyx":121 + /* "common/params_pyx.pyx":127 * cdef bool c_memory = memory * * with nogil: # <<<<<<<<<<<<<< @@ -6137,7 +6146,7 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":122 + /* "common/params_pyx.pyx":128 * * with nogil: * self.p = new c_Params(path, c_memory) # <<<<<<<<<<<<<< @@ -6150,12 +6159,12 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com PyGILState_STATE __pyx_gilstate_save = __Pyx_PyGILState_Ensure(); __Pyx_CppExn2PyErr(); __Pyx_PyGILState_Release(__pyx_gilstate_save); - __PYX_ERR(0, 122, __pyx_L4_error) + __PYX_ERR(0, 128, __pyx_L4_error) } __pyx_v_self->p = __pyx_t_6; } - /* "common/params_pyx.pyx":121 + /* "common/params_pyx.pyx":127 * cdef bool c_memory = memory * * with nogil: # <<<<<<<<<<<<<< @@ -6177,7 +6186,7 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com } } - /* "common/params_pyx.pyx":123 + /* "common/params_pyx.pyx":129 * with nogil: * self.p = new c_Params(path, c_memory) * self.d = d # <<<<<<<<<<<<<< @@ -6186,43 +6195,43 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com */ __pyx_t_1 = __pyx_v_d; __Pyx_INCREF(__pyx_t_1); - if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("str", __pyx_t_1))) __PYX_ERR(0, 123, __pyx_L1_error) + if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("str", __pyx_t_1))) __PYX_ERR(0, 129, __pyx_L1_error) __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->d); __Pyx_DECREF(__pyx_v_self->d); __pyx_v_self->d = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "common/params_pyx.pyx":126 + /* "common/params_pyx.pyx":132 * * # StarPilot variables * self.m = memory # <<<<<<<<<<<<<< * * self.return_defaults = return_defaults or memory */ - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_5 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_5 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 132, __pyx_L1_error) __pyx_v_self->m = __pyx_t_5; - /* "common/params_pyx.pyx":128 + /* "common/params_pyx.pyx":134 * self.m = memory * * self.return_defaults = return_defaults or memory # <<<<<<<<<<<<<< * * def __reduce__(self): */ - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_return_defaults); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 128, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_return_defaults); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 134, __pyx_L1_error) if (!__pyx_t_7) { } else { - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_return_defaults); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 128, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_return_defaults); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error) __pyx_t_5 = __pyx_t_8; goto __pyx_L6_bool_binop_done; } - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 128, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_memory); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error) __pyx_t_5 = __pyx_t_8; __pyx_L6_bool_binop_done:; __pyx_v_self->return_defaults = __pyx_t_5; - /* "common/params_pyx.pyx":115 + /* "common/params_pyx.pyx":121 * cdef bool return_defaults * * def __cinit__(self, d="", *, memory=False, return_defaults=False): # <<<<<<<<<<<<<< @@ -6243,7 +6252,7 @@ static int __pyx_pf_6common_10params_pyx_6Params___cinit__(struct __pyx_obj_6com return __pyx_r; } -/* "common/params_pyx.pyx":130 +/* "common/params_pyx.pyx":136 * self.return_defaults = return_defaults or memory * * def __reduce__(self): # <<<<<<<<<<<<<< @@ -6304,7 +6313,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_2__reduce__(struct __pyx_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__reduce__", 0); - /* "common/params_pyx.pyx":131 + /* "common/params_pyx.pyx":137 * * def __reduce__(self): * return (type(self), (self.d, self.m, self.return_defaults)) # <<<<<<<<<<<<<< @@ -6312,34 +6321,34 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_2__reduce__(struct __pyx_ * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 137, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_self->return_defaults); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyBool_FromLong(__pyx_v_self->return_defaults); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 137, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 137, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_self->d); __Pyx_GIVEREF(__pyx_v_self->d); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_self->d) != (0)) __PYX_ERR(0, 131, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_self->d) != (0)) __PYX_ERR(0, 137, __pyx_L1_error); __Pyx_GIVEREF(__pyx_t_1); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1) != (0)) __PYX_ERR(0, 131, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1) != (0)) __PYX_ERR(0, 137, __pyx_L1_error); __Pyx_GIVEREF(__pyx_t_2); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_2) != (0)) __PYX_ERR(0, 131, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_2) != (0)) __PYX_ERR(0, 137, __pyx_L1_error); __pyx_t_1 = 0; __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 137, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self)))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self)))); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self)))) != (0)) __PYX_ERR(0, 131, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self)))) != (0)) __PYX_ERR(0, 137, __pyx_L1_error); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3) != (0)) __PYX_ERR(0, 131, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3) != (0)) __PYX_ERR(0, 137, __pyx_L1_error); __pyx_t_3 = 0; __pyx_r = __pyx_t_2; __pyx_t_2 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":130 + /* "common/params_pyx.pyx":136 * self.return_defaults = return_defaults or memory * * def __reduce__(self): # <<<<<<<<<<<<<< @@ -6360,7 +6369,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_2__reduce__(struct __pyx_ return __pyx_r; } -/* "common/params_pyx.pyx":133 +/* "common/params_pyx.pyx":139 * return (type(self), (self.d, self.m, self.return_defaults)) * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -6383,7 +6392,7 @@ static void __pyx_pw_6common_10params_pyx_6Params_5__dealloc__(PyObject *__pyx_v static void __pyx_pf_6common_10params_pyx_6Params_4__dealloc__(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self) { - /* "common/params_pyx.pyx":134 + /* "common/params_pyx.pyx":140 * * def __dealloc__(self): * del self.p # <<<<<<<<<<<<<< @@ -6392,7 +6401,7 @@ static void __pyx_pf_6common_10params_pyx_6Params_4__dealloc__(struct __pyx_obj_ */ delete __pyx_v_self->p; - /* "common/params_pyx.pyx":133 + /* "common/params_pyx.pyx":139 * return (type(self), (self.d, self.m, self.return_defaults)) * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -6403,7 +6412,7 @@ static void __pyx_pf_6common_10params_pyx_6Params_4__dealloc__(struct __pyx_obj_ /* function exit code */ } -/* "common/params_pyx.pyx":136 +/* "common/params_pyx.pyx":142 * del self.p * * def clear_all(self, tx_flag=ParamKeyFlag.ALL): # <<<<<<<<<<<<<< @@ -6450,24 +6459,24 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_tx_flag,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 136, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 142, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 136, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 142, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "clear_all", 0) < 0) __PYX_ERR(0, 136, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "clear_all", 0) < 0) __PYX_ERR(0, 142, __pyx_L3_error) if (!values[0]) values[0] = __Pyx_NewRef(__pyx_mstate_global->__pyx_k__2); } else { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 136, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 142, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; @@ -6478,7 +6487,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("clear_all", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 136, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("clear_all", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 142, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -6508,17 +6517,17 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_6clear_all(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("clear_all", 0); - /* "common/params_pyx.pyx":137 + /* "common/params_pyx.pyx":143 * * def clear_all(self, tx_flag=ParamKeyFlag.ALL): * self.p.clearAll(tx_flag) # <<<<<<<<<<<<<< * * def check_key(self, key): */ - __pyx_t_1 = ((enum ParamKeyFlag)__Pyx_PyLong_As_enum__ParamKeyFlag(__pyx_v_tx_flag)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 137, __pyx_L1_error) + __pyx_t_1 = ((enum ParamKeyFlag)__Pyx_PyLong_As_enum__ParamKeyFlag(__pyx_v_tx_flag)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 143, __pyx_L1_error) __pyx_v_self->p->clearAll(__pyx_t_1); - /* "common/params_pyx.pyx":136 + /* "common/params_pyx.pyx":142 * del self.p * * def clear_all(self, tx_flag=ParamKeyFlag.ALL): # <<<<<<<<<<<<<< @@ -6538,7 +6547,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_6clear_all(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":139 +/* "common/params_pyx.pyx":145 * self.p.clearAll(tx_flag) * * def check_key(self, key): # <<<<<<<<<<<<<< @@ -6585,32 +6594,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 139, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 145, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 139, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 145, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "check_key", 0) < 0) __PYX_ERR(0, 139, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "check_key", 0) < 0) __PYX_ERR(0, 145, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("check_key", 1, 1, 1, i); __PYX_ERR(0, 139, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("check_key", 1, 1, 1, i); __PYX_ERR(0, 145, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 139, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 145, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("check_key", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 139, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("check_key", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 145, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -6646,7 +6655,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o __Pyx_RefNannySetupContext("check_key", 0); __Pyx_INCREF(__pyx_v_key); - /* "common/params_pyx.pyx":140 + /* "common/params_pyx.pyx":146 * * def check_key(self, key): * key = ensure_bytes(key) # <<<<<<<<<<<<<< @@ -6654,7 +6663,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o * raise UnknownKeyName(key) */ __pyx_t_2 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 146, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = 1; #if CYTHON_UNPACK_METHODS @@ -6673,24 +6682,24 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+__pyx_t_4, (2-__pyx_t_4) | (__pyx_t_4*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 146, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __Pyx_DECREF_SET(__pyx_v_key, __pyx_t_1); __pyx_t_1 = 0; - /* "common/params_pyx.pyx":141 + /* "common/params_pyx.pyx":147 * def check_key(self, key): * key = ensure_bytes(key) * if not self.p.checkKey(key): # <<<<<<<<<<<<<< * raise UnknownKeyName(key) * return key */ - __pyx_t_5 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_v_key); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_5 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_v_key); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 147, __pyx_L1_error) __pyx_t_6 = (!(__pyx_v_self->p->checkKey(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_5)) != 0)); if (unlikely(__pyx_t_6)) { - /* "common/params_pyx.pyx":142 + /* "common/params_pyx.pyx":148 * key = ensure_bytes(key) * if not self.p.checkKey(key): * raise UnknownKeyName(key) # <<<<<<<<<<<<<< @@ -6698,7 +6707,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o * */ __pyx_t_3 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_mstate_global->__pyx_n_u_UnknownKeyName); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 142, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_mstate_global->__pyx_n_u_UnknownKeyName); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = 1; #if CYTHON_UNPACK_METHODS @@ -6717,14 +6726,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+__pyx_t_4, (2-__pyx_t_4) | (__pyx_t_4*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 142, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __PYX_ERR(0, 142, __pyx_L1_error) + __PYX_ERR(0, 148, __pyx_L1_error) - /* "common/params_pyx.pyx":141 + /* "common/params_pyx.pyx":147 * def check_key(self, key): * key = ensure_bytes(key) * if not self.p.checkKey(key): # <<<<<<<<<<<<<< @@ -6733,7 +6742,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o */ } - /* "common/params_pyx.pyx":143 + /* "common/params_pyx.pyx":149 * if not self.p.checkKey(key): * raise UnknownKeyName(key) * return key # <<<<<<<<<<<<<< @@ -6745,7 +6754,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o __pyx_r = __pyx_v_key; goto __pyx_L0; - /* "common/params_pyx.pyx":139 + /* "common/params_pyx.pyx":145 * self.p.clearAll(tx_flag) * * def check_key(self, key): # <<<<<<<<<<<<<< @@ -6767,7 +6776,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_8check_key(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":145 +/* "common/params_pyx.pyx":151 * return key * * def python2cpp(self, proposed_type, expected_type, value, key): # <<<<<<<<<<<<<< @@ -6817,44 +6826,44 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_proposed_type,&__pyx_mstate_global->__pyx_n_u_expected_type,&__pyx_mstate_global->__pyx_n_u_value,&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 145, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 151, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 4: values[3] = __Pyx_ArgRef_FASTCALL(__pyx_args, 3); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 151, __pyx_L3_error) CYTHON_FALLTHROUGH; case 3: values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 151, __pyx_L3_error) CYTHON_FALLTHROUGH; case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 151, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 151, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "python2cpp", 0) < 0) __PYX_ERR(0, 145, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "python2cpp", 0) < 0) __PYX_ERR(0, 151, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 4; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("python2cpp", 1, 4, 4, i); __PYX_ERR(0, 145, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("python2cpp", 1, 4, 4, i); __PYX_ERR(0, 151, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 4)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 151, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 151, __pyx_L3_error) values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 151, __pyx_L3_error) values[3] = __Pyx_ArgRef_FASTCALL(__pyx_args, 3); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 145, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 151, __pyx_L3_error) } __pyx_v_proposed_type = values[0]; __pyx_v_expected_type = values[1]; @@ -6863,7 +6872,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("python2cpp", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 145, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("python2cpp", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 151, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -6904,7 +6913,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE int __pyx_clineno = 0; __Pyx_RefNannySetupContext("python2cpp", 0); - /* "common/params_pyx.pyx":146 + /* "common/params_pyx.pyx":152 * * def python2cpp(self, proposed_type, expected_type, value, key): * cast = PYTHON_2_CPP.get((proposed_type, expected_type)) # <<<<<<<<<<<<<< @@ -6912,19 +6921,19 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE * return cast(value) */ __pyx_t_2 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_PYTHON_2_CPP); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 146, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_PYTHON_2_CPP); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 152, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 146, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 152, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 146, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 152, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_proposed_type); __Pyx_GIVEREF(__pyx_v_proposed_type); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_proposed_type) != (0)) __PYX_ERR(0, 146, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_proposed_type) != (0)) __PYX_ERR(0, 152, __pyx_L1_error); __Pyx_INCREF(__pyx_v_expected_type); __Pyx_GIVEREF(__pyx_v_expected_type); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_expected_type) != (0)) __PYX_ERR(0, 146, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_expected_type) != (0)) __PYX_ERR(0, 152, __pyx_L1_error); __pyx_t_5 = 1; #if CYTHON_UNPACK_METHODS if (unlikely(PyMethod_Check(__pyx_t_4))) { @@ -6943,23 +6952,23 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 146, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 152, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_v_cast = __pyx_t_1; __pyx_t_1 = 0; - /* "common/params_pyx.pyx":147 + /* "common/params_pyx.pyx":153 * def python2cpp(self, proposed_type, expected_type, value, key): * cast = PYTHON_2_CPP.get((proposed_type, expected_type)) * if cast: # <<<<<<<<<<<<<< * return cast(value) * raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}") */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_cast); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 147, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_cast); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 153, __pyx_L1_error) if (__pyx_t_6) { - /* "common/params_pyx.pyx":148 + /* "common/params_pyx.pyx":154 * cast = PYTHON_2_CPP.get((proposed_type, expected_type)) * if cast: * return cast(value) # <<<<<<<<<<<<<< @@ -6987,14 +6996,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+__pyx_t_5, (2-__pyx_t_5) | (__pyx_t_5*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 148, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":147 + /* "common/params_pyx.pyx":153 * def python2cpp(self, proposed_type, expected_type, value, key): * cast = PYTHON_2_CPP.get((proposed_type, expected_type)) * if cast: # <<<<<<<<<<<<<< @@ -7003,7 +7012,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE */ } - /* "common/params_pyx.pyx":149 + /* "common/params_pyx.pyx":155 * if cast: * return cast(value) * raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}") # <<<<<<<<<<<<<< @@ -7013,13 +7022,13 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE __pyx_t_3 = NULL; __Pyx_INCREF(__pyx_builtin_TypeError); __pyx_t_4 = __pyx_builtin_TypeError; - __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_key, __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 149, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_key, __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_7 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_proposed_type), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 149, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_proposed_type), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_expected_type), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 149, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_expected_type), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_9 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_value), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 149, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_value), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10[0] = __pyx_mstate_global->__pyx_kp_u_Type_mismatch_while_writing_para; __pyx_t_10[1] = __pyx_t_2; @@ -7030,7 +7039,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE __pyx_t_10[6] = __pyx_mstate_global->__pyx_kp_u_value_2; __pyx_t_10[7] = __pyx_t_9; __pyx_t_11 = __Pyx_PyUnicode_Join(__pyx_t_10, 8, 34 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_2) + 16 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_7) + 15 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_8) + 7 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_9), 127 | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_7) | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_8) | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_9)); - if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 149, __pyx_L1_error) + if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -7043,14 +7052,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 149, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 155, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __PYX_ERR(0, 149, __pyx_L1_error) + __PYX_ERR(0, 155, __pyx_L1_error) - /* "common/params_pyx.pyx":145 + /* "common/params_pyx.pyx":151 * return key * * def python2cpp(self, proposed_type, expected_type, value, key): # <<<<<<<<<<<<<< @@ -7077,7 +7086,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_10python2cpp(CYTHON_UNUSE return __pyx_r; } -/* "common/params_pyx.pyx":151 +/* "common/params_pyx.pyx":157 * raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}") * * def _cpp2python(self, t, value, default, key): # <<<<<<<<<<<<<< @@ -7127,44 +7136,44 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_t,&__pyx_mstate_global->__pyx_n_u_value,&__pyx_mstate_global->__pyx_n_u_default,&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 151, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 157, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 4: values[3] = __Pyx_ArgRef_FASTCALL(__pyx_args, 3); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 157, __pyx_L3_error) CYTHON_FALLTHROUGH; case 3: values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 157, __pyx_L3_error) CYTHON_FALLTHROUGH; case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 157, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 157, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_cpp2python", 0) < 0) __PYX_ERR(0, 151, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_cpp2python", 0) < 0) __PYX_ERR(0, 157, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 4; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_cpp2python", 1, 4, 4, i); __PYX_ERR(0, 151, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_cpp2python", 1, 4, 4, i); __PYX_ERR(0, 157, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 4)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 157, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 157, __pyx_L3_error) values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 157, __pyx_L3_error) values[3] = __Pyx_ArgRef_FASTCALL(__pyx_args, 3); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 151, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[3])) __PYX_ERR(0, 157, __pyx_L3_error) } __pyx_v_t = values[0]; __pyx_v_value = values[1]; @@ -7173,7 +7182,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("_cpp2python", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 151, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("_cpp2python", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 157, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -7219,7 +7228,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_cpp2python", 0); - /* "common/params_pyx.pyx":152 + /* "common/params_pyx.pyx":158 * * def _cpp2python(self, t, value, default, key): * if value is None: # <<<<<<<<<<<<<< @@ -7229,7 +7238,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __pyx_t_1 = (__pyx_v_value == Py_None); if (__pyx_t_1) { - /* "common/params_pyx.pyx":153 + /* "common/params_pyx.pyx":159 * def _cpp2python(self, t, value, default, key): * if value is None: * return None # <<<<<<<<<<<<<< @@ -7240,7 +7249,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "common/params_pyx.pyx":152 + /* "common/params_pyx.pyx":158 * * def _cpp2python(self, t, value, default, key): * if value is None: # <<<<<<<<<<<<<< @@ -7249,7 +7258,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py */ } - /* "common/params_pyx.pyx":154 + /* "common/params_pyx.pyx":160 * if value is None: * return None * try: # <<<<<<<<<<<<<< @@ -7265,7 +7274,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __Pyx_XGOTREF(__pyx_t_4); /*try:*/ { - /* "common/params_pyx.pyx":155 + /* "common/params_pyx.pyx":161 * return None * try: * return CPP_2_PYTHON[t](value) # <<<<<<<<<<<<<< @@ -7274,9 +7283,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py */ __Pyx_XDECREF(__pyx_r); __pyx_t_6 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_CPP_2_PYTHON); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 155, __pyx_L4_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_CPP_2_PYTHON); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = __Pyx_PyObject_GetItem(__pyx_t_7, __pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 155, __pyx_L4_error) + __pyx_t_8 = __Pyx_PyObject_GetItem(__pyx_t_7, __pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 161, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_9 = 1; @@ -7296,14 +7305,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+__pyx_t_9, (2-__pyx_t_9) | (__pyx_t_9*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L4_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 161, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_5); } __pyx_r = __pyx_t_5; __pyx_t_5 = 0; goto __pyx_L8_try_return; - /* "common/params_pyx.pyx":154 + /* "common/params_pyx.pyx":160 * if value is None: * return None * try: # <<<<<<<<<<<<<< @@ -7317,7 +7326,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "common/params_pyx.pyx":156 + /* "common/params_pyx.pyx":162 * try: * return CPP_2_PYTHON[t](value) * except (KeyError, TypeError, ValueError): # <<<<<<<<<<<<<< @@ -7327,12 +7336,12 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __pyx_t_10 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_KeyError) || __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError) || __Pyx_PyErr_ExceptionMatches(__pyx_builtin_ValueError); if (__pyx_t_10) { __Pyx_AddTraceback("common.params_pyx.Params._cpp2python", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_8, &__pyx_t_6) < 0) __PYX_ERR(0, 156, __pyx_L6_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_8, &__pyx_t_6) < 0) __PYX_ERR(0, 162, __pyx_L6_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_8); __Pyx_XGOTREF(__pyx_t_6); - /* "common/params_pyx.pyx":157 + /* "common/params_pyx.pyx":163 * return CPP_2_PYTHON[t](value) * except (KeyError, TypeError, ValueError): * cloudlog.warning(f"Failed to cast param {key} with {value=} from type {t=}") # <<<<<<<<<<<<<< @@ -7340,16 +7349,16 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py * */ __pyx_t_11 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_cloudlog); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 157, __pyx_L6_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_cloudlog); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_warning); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 157, __pyx_L6_except_error) + __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_warning); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_PyObject_FormatSimple(__pyx_v_key, __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 157, __pyx_L6_except_error) + __pyx_t_12 = __Pyx_PyObject_FormatSimple(__pyx_v_key, __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_14 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_value), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 157, __pyx_L6_except_error) + __pyx_t_14 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_value), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_15 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_t), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 157, __pyx_L6_except_error) + __pyx_t_15 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Repr(__pyx_v_t), __pyx_mstate_global->__pyx_empty_unicode); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_15); __pyx_t_16[0] = __pyx_mstate_global->__pyx_kp_u_Failed_to_cast_param; __pyx_t_16[1] = __pyx_t_12; @@ -7358,7 +7367,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __pyx_t_16[4] = __pyx_mstate_global->__pyx_kp_u_from_type_t; __pyx_t_16[5] = __pyx_t_15; __pyx_t_17 = __Pyx_PyUnicode_Join(__pyx_t_16, 6, 21 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_12) + 12 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_14) + 13 + __Pyx_PyUnicode_GET_LENGTH(__pyx_t_15), 127 | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_12) | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_14) | __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_15)); - if (unlikely(!__pyx_t_17)) __PYX_ERR(0, 157, __pyx_L6_except_error) + if (unlikely(!__pyx_t_17)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_17); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; @@ -7381,12 +7390,12 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_DECREF(__pyx_t_17); __pyx_t_17 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 157, __pyx_L6_except_error) + if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 163, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_7); } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "common/params_pyx.pyx":158 + /* "common/params_pyx.pyx":164 * except (KeyError, TypeError, ValueError): * cloudlog.warning(f"Failed to cast param {key} with {value=} from type {t=}") * return self._cpp2python(t, default, None, key) # <<<<<<<<<<<<<< @@ -7401,7 +7410,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py PyObject *__pyx_callargs[5] = {__pyx_t_13, __pyx_v_t, __pyx_v_default, Py_None, __pyx_v_key}; __pyx_t_7 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_cpp2python, __pyx_callargs+__pyx_t_9, (5-__pyx_t_9) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 158, __pyx_L6_except_error) + if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 164, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_7); } __pyx_r = __pyx_t_7; @@ -7413,7 +7422,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py } goto __pyx_L6_except_error; - /* "common/params_pyx.pyx":154 + /* "common/params_pyx.pyx":160 * if value is None: * return None * try: # <<<<<<<<<<<<<< @@ -7440,7 +7449,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py goto __pyx_L0; } - /* "common/params_pyx.pyx":151 + /* "common/params_pyx.pyx":157 * raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}") * * def _cpp2python(self, t, value, default, key): # <<<<<<<<<<<<<< @@ -7468,7 +7477,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_12_cpp2python(struct __py return __pyx_r; } -/* "common/params_pyx.pyx":160 +/* "common/params_pyx.pyx":166 * return self._cpp2python(t, default, None, key) * * def get(self, key, bool block=False, bool return_default=False): # <<<<<<<<<<<<<< @@ -7517,61 +7526,61 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_block,&__pyx_mstate_global->__pyx_n_u_return_default,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 160, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 166, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 3: values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 166, __pyx_L3_error) CYTHON_FALLTHROUGH; case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 166, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 166, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get", 0) < 0) __PYX_ERR(0, 160, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get", 0) < 0) __PYX_ERR(0, 166, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get", 0, 1, 3, i); __PYX_ERR(0, 160, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get", 0, 1, 3, i); __PYX_ERR(0, 166, __pyx_L3_error) } } } else { switch (__pyx_nargs) { case 3: values[2] = __Pyx_ArgRef_FASTCALL(__pyx_args, 2); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[2])) __PYX_ERR(0, 166, __pyx_L3_error) CYTHON_FALLTHROUGH; case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 166, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 160, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 166, __pyx_L3_error) break; default: goto __pyx_L5_argtuple_error; } } __pyx_v_key = values[0]; if (values[1]) { - __pyx_v_block = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_block == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 160, __pyx_L3_error) + __pyx_v_block = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_block == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 166, __pyx_L3_error) } else { __pyx_v_block = ((bool)0); } if (values[2]) { - __pyx_v_return_default = __Pyx_PyObject_IsTrue(values[2]); if (unlikely((__pyx_v_return_default == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 160, __pyx_L3_error) + __pyx_v_return_default = __Pyx_PyObject_IsTrue(values[2]); if (unlikely((__pyx_v_return_default == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 166, __pyx_L3_error) } else { __pyx_v_return_default = ((bool)0); } } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 160, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 166, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -7614,7 +7623,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get", 0); - /* "common/params_pyx.pyx":161 + /* "common/params_pyx.pyx":167 * * def get(self, key, bool block=False, bool return_default=False): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -7628,14 +7637,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 161, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 167, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 167, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":162 + /* "common/params_pyx.pyx":168 * def get(self, key, bool block=False, bool return_default=False): * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) # <<<<<<<<<<<<<< @@ -7644,7 +7653,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c */ __pyx_v_t = __pyx_v_self->p->getKeyType(__pyx_v_k); - /* "common/params_pyx.pyx":163 + /* "common/params_pyx.pyx":169 * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) * cdef optional[string] default = self.p.getKeyDefaultValue(k) # <<<<<<<<<<<<<< @@ -7653,7 +7662,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c */ __pyx_v_default = __pyx_v_self->p->getKeyDefaultValue(__pyx_v_k); - /* "common/params_pyx.pyx":165 + /* "common/params_pyx.pyx":171 * cdef optional[string] default = self.p.getKeyDefaultValue(k) * cdef string val * with nogil: # <<<<<<<<<<<<<< @@ -7667,7 +7676,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":166 + /* "common/params_pyx.pyx":172 * cdef string val * with nogil: * val = self.p.get(k, block) # <<<<<<<<<<<<<< @@ -7677,7 +7686,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_v_val = __pyx_v_self->p->get(__pyx_v_k, __pyx_v_block); } - /* "common/params_pyx.pyx":165 + /* "common/params_pyx.pyx":171 * cdef optional[string] default = self.p.getKeyDefaultValue(k) * cdef string val * with nogil: # <<<<<<<<<<<<<< @@ -7694,7 +7703,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c } } - /* "common/params_pyx.pyx":168 + /* "common/params_pyx.pyx":174 * val = self.p.get(k, block) * * default_val = (default.value() if default.has_value() else None) if (return_default or self.return_defaults and not block) else None # <<<<<<<<<<<<<< @@ -7723,9 +7732,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_t_7 = __pyx_v_default.value(); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 168, __pyx_L1_error) + __PYX_ERR(0, 174, __pyx_L1_error) } - __pyx_t_8 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 168, __pyx_L1_error) + __pyx_t_8 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_2 = __pyx_t_8; __pyx_t_8 = 0; @@ -7742,7 +7751,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_v_default_val = __pyx_t_1; __pyx_t_1 = 0; - /* "common/params_pyx.pyx":169 + /* "common/params_pyx.pyx":175 * * default_val = (default.value() if default.has_value() else None) if (return_default or self.return_defaults and not block) else None * if val == b"": # <<<<<<<<<<<<<< @@ -7752,7 +7761,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_t_5 = (__pyx_v_val == ((char const *)"")); if (__pyx_t_5) { - /* "common/params_pyx.pyx":170 + /* "common/params_pyx.pyx":176 * default_val = (default.value() if default.has_value() else None) if (return_default or self.return_defaults and not block) else None * if val == b"": * if block: # <<<<<<<<<<<<<< @@ -7762,7 +7771,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_t_5 = (__pyx_v_block != 0); if (unlikely(__pyx_t_5)) { - /* "common/params_pyx.pyx":173 + /* "common/params_pyx.pyx":179 * # If we got no value while running in blocked mode * # it means we got an interrupt while waiting * raise KeyboardInterrupt # <<<<<<<<<<<<<< @@ -7770,9 +7779,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c * return self._cpp2python(t, default_val, None, key) */ __Pyx_Raise(__pyx_builtin_KeyboardInterrupt, 0, 0, 0); - __PYX_ERR(0, 173, __pyx_L1_error) + __PYX_ERR(0, 179, __pyx_L1_error) - /* "common/params_pyx.pyx":170 + /* "common/params_pyx.pyx":176 * default_val = (default.value() if default.has_value() else None) if (return_default or self.return_defaults and not block) else None * if val == b"": * if block: # <<<<<<<<<<<<<< @@ -7781,7 +7790,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c */ } - /* "common/params_pyx.pyx":175 + /* "common/params_pyx.pyx":181 * raise KeyboardInterrupt * else: * return self._cpp2python(t, default_val, None, key) # <<<<<<<<<<<<<< @@ -7792,7 +7801,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __Pyx_XDECREF(__pyx_r); __pyx_t_2 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_2); - __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 175, __pyx_L1_error) + __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 181, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_3 = 0; { @@ -7800,7 +7809,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_cpp2python, __pyx_callargs+__pyx_t_3, (5-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 175, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 181, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; @@ -7808,7 +7817,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c goto __pyx_L0; } - /* "common/params_pyx.pyx":169 + /* "common/params_pyx.pyx":175 * * default_val = (default.value() if default.has_value() else None) if (return_default or self.return_defaults and not block) else None * if val == b"": # <<<<<<<<<<<<<< @@ -7817,7 +7826,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c */ } - /* "common/params_pyx.pyx":176 + /* "common/params_pyx.pyx":182 * else: * return self._cpp2python(t, default_val, None, key) * return self._cpp2python(t, val, default_val, key) # <<<<<<<<<<<<<< @@ -7827,9 +7836,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __Pyx_XDECREF(__pyx_r); __pyx_t_8 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_8); - __pyx_t_2 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 176, __pyx_L1_error) + __pyx_t_2 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_v_val); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 176, __pyx_L1_error) + __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_v_val); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 182, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_3 = 0; { @@ -7838,14 +7847,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 176, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 182, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":160 + /* "common/params_pyx.pyx":166 * return self._cpp2python(t, default, None, key) * * def get(self, key, bool block=False, bool return_default=False): # <<<<<<<<<<<<<< @@ -7868,7 +7877,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_14get(struct __pyx_obj_6c return __pyx_r; } -/* "common/params_pyx.pyx":178 +/* "common/params_pyx.pyx":184 * return self._cpp2python(t, val, default_val, key) * * def get_bool(self, key, bool block=False): # <<<<<<<<<<<<<< @@ -7916,48 +7925,48 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_block,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 178, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 184, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 178, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 184, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 178, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 184, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_bool", 0) < 0) __PYX_ERR(0, 178, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_bool", 0) < 0) __PYX_ERR(0, 184, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_bool", 0, 1, 2, i); __PYX_ERR(0, 178, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_bool", 0, 1, 2, i); __PYX_ERR(0, 184, __pyx_L3_error) } } } else { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 178, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 184, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 178, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 184, __pyx_L3_error) break; default: goto __pyx_L5_argtuple_error; } } __pyx_v_key = values[0]; if (values[1]) { - __pyx_v_block = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_block == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 178, __pyx_L3_error) + __pyx_v_block = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_block == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 184, __pyx_L3_error) } else { __pyx_v_block = ((bool)0); } } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_bool", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 178, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_bool", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 184, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -7992,7 +8001,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_bool", 0); - /* "common/params_pyx.pyx":179 + /* "common/params_pyx.pyx":185 * * def get_bool(self, key, bool block=False): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -8006,14 +8015,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 179, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 185, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 179, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 185, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":181 + /* "common/params_pyx.pyx":187 * cdef string k = self.check_key(key) * cdef bool r * with nogil: # <<<<<<<<<<<<<< @@ -8027,7 +8036,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":182 + /* "common/params_pyx.pyx":188 * cdef bool r * with nogil: * r = self.p.getBool(k, block) # <<<<<<<<<<<<<< @@ -8037,7 +8046,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o __pyx_v_r = __pyx_v_self->p->getBool(__pyx_v_k, __pyx_v_block); } - /* "common/params_pyx.pyx":181 + /* "common/params_pyx.pyx":187 * cdef string k = self.check_key(key) * cdef bool r * with nogil: # <<<<<<<<<<<<<< @@ -8054,7 +8063,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o } } - /* "common/params_pyx.pyx":183 + /* "common/params_pyx.pyx":189 * with nogil: * r = self.p.getBool(k, block) * return r # <<<<<<<<<<<<<< @@ -8062,13 +8071,13 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o * def _put_cast(self, key, dat): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_r); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 183, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_r); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":178 + /* "common/params_pyx.pyx":184 * return self._cpp2python(t, val, default_val, key) * * def get_bool(self, key, bool block=False): # <<<<<<<<<<<<<< @@ -8088,7 +8097,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_16get_bool(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":185 +/* "common/params_pyx.pyx":191 * return r * * def _put_cast(self, key, dat): # <<<<<<<<<<<<<< @@ -8136,39 +8145,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_dat,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 185, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 191, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 185, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 191, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 185, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 191, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_put_cast", 0) < 0) __PYX_ERR(0, 185, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "_put_cast", 0) < 0) __PYX_ERR(0, 191, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_put_cast", 1, 2, 2, i); __PYX_ERR(0, 185, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("_put_cast", 1, 2, 2, i); __PYX_ERR(0, 191, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 185, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 191, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 185, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 191, __pyx_L3_error) } __pyx_v_key = values[0]; __pyx_v_dat = values[1]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("_put_cast", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 185, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("_put_cast", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 191, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -8207,7 +8216,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_put_cast", 0); - /* "common/params_pyx.pyx":186 + /* "common/params_pyx.pyx":192 * * def _put_cast(self, key, dat): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -8221,14 +8230,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 186, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 192, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 186, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 192, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":187 + /* "common/params_pyx.pyx":193 * def _put_cast(self, key, dat): * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) # <<<<<<<<<<<<<< @@ -8237,7 +8246,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ */ __pyx_v_t = __pyx_v_self->p->getKeyType(__pyx_v_k); - /* "common/params_pyx.pyx":188 + /* "common/params_pyx.pyx":194 * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) * return ensure_bytes(self.python2cpp(type(dat), t, dat, key)) # <<<<<<<<<<<<<< @@ -8246,11 +8255,11 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ */ __Pyx_XDECREF(__pyx_r); __pyx_t_2 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 188, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_7 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_7); - __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 188, __pyx_L1_error) + __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_3 = 0; { @@ -8258,7 +8267,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ __pyx_t_6 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_python2cpp, __pyx_callargs+__pyx_t_3, (5-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 188, __pyx_L1_error) + if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); } __pyx_t_3 = 1; @@ -8279,14 +8288,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 188, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":185 + /* "common/params_pyx.pyx":191 * return r * * def _put_cast(self, key, dat): # <<<<<<<<<<<<<< @@ -8310,7 +8319,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_18_put_cast(struct __pyx_ return __pyx_r; } -/* "common/params_pyx.pyx":190 +/* "common/params_pyx.pyx":196 * return ensure_bytes(self.python2cpp(type(dat), t, dat, key)) * * def put(self, key, dat): # <<<<<<<<<<<<<< @@ -8359,39 +8368,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_dat,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 190, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 196, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 190, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 196, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 190, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 196, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put", 0) < 0) __PYX_ERR(0, 190, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put", 0) < 0) __PYX_ERR(0, 196, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put", 1, 2, 2, i); __PYX_ERR(0, 190, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put", 1, 2, 2, i); __PYX_ERR(0, 196, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 190, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 196, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 190, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 196, __pyx_L3_error) } __pyx_v_key = values[0]; __pyx_v_dat = values[1]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("put", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 190, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("put", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 196, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -8426,7 +8435,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c int __pyx_clineno = 0; __Pyx_RefNannySetupContext("put", 0); - /* "common/params_pyx.pyx":197 + /* "common/params_pyx.pyx":203 * in general try to avoid writing params as much as possible. * """ * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -8440,14 +8449,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 197, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 203, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 197, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 203, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":198 + /* "common/params_pyx.pyx":204 * """ * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) # <<<<<<<<<<<<<< @@ -8461,14 +8470,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c PyObject *__pyx_callargs[3] = {__pyx_t_2, __pyx_v_key, __pyx_v_dat}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_put_cast, __pyx_callargs+__pyx_t_3, (3-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 198, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 204, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 198, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 204, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_dat_bytes = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":199 + /* "common/params_pyx.pyx":205 * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: # <<<<<<<<<<<<<< @@ -8482,7 +8491,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":200 + /* "common/params_pyx.pyx":206 * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: * self.p.put(k, dat_bytes) # <<<<<<<<<<<<<< @@ -8492,7 +8501,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c (void)(__pyx_v_self->p->put(__pyx_v_k, __pyx_v_dat_bytes)); } - /* "common/params_pyx.pyx":199 + /* "common/params_pyx.pyx":205 * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: # <<<<<<<<<<<<<< @@ -8509,7 +8518,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c } } - /* "common/params_pyx.pyx":190 + /* "common/params_pyx.pyx":196 * return ensure_bytes(self.python2cpp(type(dat), t, dat, key)) * * def put(self, key, dat): # <<<<<<<<<<<<<< @@ -8531,7 +8540,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_20put(struct __pyx_obj_6c return __pyx_r; } -/* "common/params_pyx.pyx":202 +/* "common/params_pyx.pyx":208 * self.p.put(k, dat_bytes) * * def put_bool(self, key, bool val): # <<<<<<<<<<<<<< @@ -8579,39 +8588,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_val,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 202, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 208, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 202, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 208, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 202, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 208, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_bool", 0) < 0) __PYX_ERR(0, 202, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_bool", 0) < 0) __PYX_ERR(0, 208, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_bool", 1, 2, 2, i); __PYX_ERR(0, 202, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_bool", 1, 2, 2, i); __PYX_ERR(0, 208, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 202, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 208, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 202, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 208, __pyx_L3_error) } __pyx_v_key = values[0]; - __pyx_v_val = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_val == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 202, __pyx_L3_error) + __pyx_v_val = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_val == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 208, __pyx_L3_error) } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("put_bool", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 202, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("put_bool", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 208, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -8645,7 +8654,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("put_bool", 0); - /* "common/params_pyx.pyx":203 + /* "common/params_pyx.pyx":209 * * def put_bool(self, key, bool val): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -8659,14 +8668,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 203, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 209, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 203, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 209, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":204 + /* "common/params_pyx.pyx":210 * def put_bool(self, key, bool val): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -8680,7 +8689,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":205 + /* "common/params_pyx.pyx":211 * cdef string k = self.check_key(key) * with nogil: * self.p.putBool(k, val) # <<<<<<<<<<<<<< @@ -8690,7 +8699,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o (void)(__pyx_v_self->p->putBool(__pyx_v_k, __pyx_v_val)); } - /* "common/params_pyx.pyx":204 + /* "common/params_pyx.pyx":210 * def put_bool(self, key, bool val): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -8707,7 +8716,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o } } - /* "common/params_pyx.pyx":202 + /* "common/params_pyx.pyx":208 * self.p.put(k, dat_bytes) * * def put_bool(self, key, bool val): # <<<<<<<<<<<<<< @@ -8729,7 +8738,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_22put_bool(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":207 +/* "common/params_pyx.pyx":213 * self.p.putBool(k, val) * * def put_nonblocking(self, key, dat): # <<<<<<<<<<<<<< @@ -8777,39 +8786,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_dat,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 207, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 213, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 207, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 213, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 207, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 213, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_nonblocking", 0) < 0) __PYX_ERR(0, 207, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_nonblocking", 0) < 0) __PYX_ERR(0, 213, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_nonblocking", 1, 2, 2, i); __PYX_ERR(0, 207, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_nonblocking", 1, 2, 2, i); __PYX_ERR(0, 213, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 207, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 213, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 207, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 213, __pyx_L3_error) } __pyx_v_key = values[0]; __pyx_v_dat = values[1]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("put_nonblocking", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 207, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("put_nonblocking", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 213, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -8844,7 +8853,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct int __pyx_clineno = 0; __Pyx_RefNannySetupContext("put_nonblocking", 0); - /* "common/params_pyx.pyx":208 + /* "common/params_pyx.pyx":214 * * def put_nonblocking(self, key, dat): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -8858,14 +8867,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 208, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 208, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":209 + /* "common/params_pyx.pyx":215 * def put_nonblocking(self, key, dat): * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) # <<<<<<<<<<<<<< @@ -8879,14 +8888,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct PyObject *__pyx_callargs[3] = {__pyx_t_2, __pyx_v_key, __pyx_v_dat}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_put_cast, __pyx_callargs+__pyx_t_3, (3-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 209, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 215, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 215, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_dat_bytes = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":210 + /* "common/params_pyx.pyx":216 * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: # <<<<<<<<<<<<<< @@ -8900,7 +8909,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":211 + /* "common/params_pyx.pyx":217 * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: * self.p.putNonBlocking(k, dat_bytes) # <<<<<<<<<<<<<< @@ -8910,7 +8919,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct __pyx_v_self->p->putNonBlocking(__pyx_v_k, __pyx_v_dat_bytes); } - /* "common/params_pyx.pyx":210 + /* "common/params_pyx.pyx":216 * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) * with nogil: # <<<<<<<<<<<<<< @@ -8927,7 +8936,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct } } - /* "common/params_pyx.pyx":207 + /* "common/params_pyx.pyx":213 * self.p.putBool(k, val) * * def put_nonblocking(self, key, dat): # <<<<<<<<<<<<<< @@ -8949,7 +8958,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_24put_nonblocking(struct return __pyx_r; } -/* "common/params_pyx.pyx":213 +/* "common/params_pyx.pyx":219 * self.p.putNonBlocking(k, dat_bytes) * * def put_bool_nonblocking(self, key, bool val): # <<<<<<<<<<<<<< @@ -8997,39 +9006,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_val,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 213, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 219, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 213, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 219, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 213, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 219, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_bool_nonblocking", 0) < 0) __PYX_ERR(0, 213, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "put_bool_nonblocking", 0) < 0) __PYX_ERR(0, 219, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_bool_nonblocking", 1, 2, 2, i); __PYX_ERR(0, 213, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("put_bool_nonblocking", 1, 2, 2, i); __PYX_ERR(0, 219, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 213, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 219, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 213, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 219, __pyx_L3_error) } __pyx_v_key = values[0]; - __pyx_v_val = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_val == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 213, __pyx_L3_error) + __pyx_v_val = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_val == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 219, __pyx_L3_error) } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("put_bool_nonblocking", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 213, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("put_bool_nonblocking", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 219, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9063,7 +9072,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st int __pyx_clineno = 0; __Pyx_RefNannySetupContext("put_bool_nonblocking", 0); - /* "common/params_pyx.pyx":214 + /* "common/params_pyx.pyx":220 * * def put_bool_nonblocking(self, key, bool val): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -9077,14 +9086,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 214, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 220, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 214, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 220, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":215 + /* "common/params_pyx.pyx":221 * def put_bool_nonblocking(self, key, bool val): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -9098,7 +9107,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":216 + /* "common/params_pyx.pyx":222 * cdef string k = self.check_key(key) * with nogil: * self.p.putBoolNonBlocking(k, val) # <<<<<<<<<<<<<< @@ -9108,7 +9117,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st __pyx_v_self->p->putBoolNonBlocking(__pyx_v_k, __pyx_v_val); } - /* "common/params_pyx.pyx":215 + /* "common/params_pyx.pyx":221 * def put_bool_nonblocking(self, key, bool val): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -9125,7 +9134,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st } } - /* "common/params_pyx.pyx":213 + /* "common/params_pyx.pyx":219 * self.p.putNonBlocking(k, dat_bytes) * * def put_bool_nonblocking(self, key, bool val): # <<<<<<<<<<<<<< @@ -9147,7 +9156,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_26put_bool_nonblocking(st return __pyx_r; } -/* "common/params_pyx.pyx":218 +/* "common/params_pyx.pyx":224 * self.p.putBoolNonBlocking(k, val) * * def remove(self, key): # <<<<<<<<<<<<<< @@ -9194,32 +9203,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 218, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 224, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 218, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 224, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "remove", 0) < 0) __PYX_ERR(0, 218, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "remove", 0) < 0) __PYX_ERR(0, 224, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("remove", 1, 1, 1, i); __PYX_ERR(0, 218, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("remove", 1, 1, 1, i); __PYX_ERR(0, 224, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 218, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 224, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("remove", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 218, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("remove", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 224, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9253,7 +9262,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("remove", 0); - /* "common/params_pyx.pyx":219 + /* "common/params_pyx.pyx":225 * * def remove(self, key): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -9267,14 +9276,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 219, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 225, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 219, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 225, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":220 + /* "common/params_pyx.pyx":226 * def remove(self, key): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -9288,7 +9297,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj __Pyx_FastGIL_Remember(); /*try:*/ { - /* "common/params_pyx.pyx":221 + /* "common/params_pyx.pyx":227 * cdef string k = self.check_key(key) * with nogil: * self.p.remove(k) # <<<<<<<<<<<<<< @@ -9298,7 +9307,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj (void)(__pyx_v_self->p->remove(__pyx_v_k)); } - /* "common/params_pyx.pyx":220 + /* "common/params_pyx.pyx":226 * def remove(self, key): * cdef string k = self.check_key(key) * with nogil: # <<<<<<<<<<<<<< @@ -9315,7 +9324,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj } } - /* "common/params_pyx.pyx":218 + /* "common/params_pyx.pyx":224 * self.p.putBoolNonBlocking(k, val) * * def remove(self, key): # <<<<<<<<<<<<<< @@ -9337,7 +9346,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_28remove(struct __pyx_obj return __pyx_r; } -/* "common/params_pyx.pyx":223 +/* "common/params_pyx.pyx":229 * self.p.remove(k) * * def get_param_path(self, key=""): # <<<<<<<<<<<<<< @@ -9384,24 +9393,24 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 223, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 229, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 223, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 229, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_param_path", 0) < 0) __PYX_ERR(0, 223, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_param_path", 0) < 0) __PYX_ERR(0, 229, __pyx_L3_error) if (!values[0]) values[0] = __Pyx_NewRef(((PyObject *)__pyx_mstate_global->__pyx_kp_u_)); } else { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 223, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 229, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; @@ -9412,7 +9421,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_param_path", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 223, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_param_path", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 229, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9447,7 +9456,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_30get_param_path(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_param_path", 0); - /* "common/params_pyx.pyx":224 + /* "common/params_pyx.pyx":230 * * def get_param_path(self, key=""): * cdef string key_bytes = ensure_bytes(key) # <<<<<<<<<<<<<< @@ -9455,7 +9464,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_30get_param_path(struct _ * */ __pyx_t_2 = NULL; - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 224, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_mstate_global->__pyx_n_u_ensure_bytes); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 230, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = 1; #if CYTHON_UNPACK_METHODS @@ -9474,14 +9483,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_30get_param_path(struct _ __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+__pyx_t_4, (2-__pyx_t_4) | (__pyx_t_4*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 230, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_5 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_5 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 230, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_key_bytes = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_5); - /* "common/params_pyx.pyx":225 + /* "common/params_pyx.pyx":231 * def get_param_path(self, key=""): * cdef string key_bytes = ensure_bytes(key) * return self.p.getParamPath(key_bytes).decode("utf-8") # <<<<<<<<<<<<<< @@ -9489,13 +9498,13 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_30get_param_path(struct _ * def get_type(self, key): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_decode_cpp_string(__pyx_v_self->p->getParamPath(__pyx_v_key_bytes), 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 225, __pyx_L1_error) + __pyx_t_1 = __Pyx_decode_cpp_string(__pyx_v_self->p->getParamPath(__pyx_v_key_bytes), 0, PY_SSIZE_T_MAX, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":223 + /* "common/params_pyx.pyx":229 * self.p.remove(k) * * def get_param_path(self, key=""): # <<<<<<<<<<<<<< @@ -9516,7 +9525,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_30get_param_path(struct _ return __pyx_r; } -/* "common/params_pyx.pyx":227 +/* "common/params_pyx.pyx":233 * return self.p.getParamPath(key_bytes).decode("utf-8") * * def get_type(self, key): # <<<<<<<<<<<<<< @@ -9563,32 +9572,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 227, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 233, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 227, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 233, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_type", 0) < 0) __PYX_ERR(0, 227, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_type", 0) < 0) __PYX_ERR(0, 233, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_type", 1, 1, 1, i); __PYX_ERR(0, 227, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_type", 1, 1, 1, i); __PYX_ERR(0, 233, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 227, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 233, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_type", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 227, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_type", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 233, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9621,7 +9630,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_32get_type(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_type", 0); - /* "common/params_pyx.pyx":228 + /* "common/params_pyx.pyx":234 * * def get_type(self, key): * return self.p.getKeyType(self.check_key(key)) # <<<<<<<<<<<<<< @@ -9636,18 +9645,18 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_32get_type(struct __pyx_o PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 228, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 234, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 228, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_self->p->getKeyType(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 228, __pyx_L1_error) + __pyx_t_1 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_self->p->getKeyType(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 234, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":227 + /* "common/params_pyx.pyx":233 * return self.p.getParamPath(key_bytes).decode("utf-8") * * def get_type(self, key): # <<<<<<<<<<<<<< @@ -9667,7 +9676,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_32get_type(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":230 +/* "common/params_pyx.pyx":236 * return self.p.getKeyType(self.check_key(key)) * * def all_keys(self): # <<<<<<<<<<<<<< @@ -9726,7 +9735,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_34all_keys(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("all_keys", 0); - /* "common/params_pyx.pyx":231 + /* "common/params_pyx.pyx":237 * * def all_keys(self): * return self.p.allKeys() # <<<<<<<<<<<<<< @@ -9734,13 +9743,13 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_34all_keys(struct __pyx_o * def get_default_value(self, key): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_convert_vector_to_py_std_3a__3a_string(__pyx_v_self->p->allKeys()); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error) + __pyx_t_1 = __pyx_convert_vector_to_py_std_3a__3a_string(__pyx_v_self->p->allKeys()); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 237, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":230 + /* "common/params_pyx.pyx":236 * return self.p.getKeyType(self.check_key(key)) * * def all_keys(self): # <<<<<<<<<<<<<< @@ -9759,7 +9768,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_34all_keys(struct __pyx_o return __pyx_r; } -/* "common/params_pyx.pyx":233 +/* "common/params_pyx.pyx":239 * return self.p.allKeys() * * def get_default_value(self, key): # <<<<<<<<<<<<<< @@ -9806,32 +9815,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 233, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 239, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 233, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 239, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_default_value", 0) < 0) __PYX_ERR(0, 233, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_default_value", 0) < 0) __PYX_ERR(0, 239, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_default_value", 1, 1, 1, i); __PYX_ERR(0, 233, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_default_value", 1, 1, 1, i); __PYX_ERR(0, 239, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 233, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 239, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_default_value", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 233, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_default_value", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 239, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9872,7 +9881,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_default_value", 0); - /* "common/params_pyx.pyx":234 + /* "common/params_pyx.pyx":240 * * def get_default_value(self, key): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -9886,14 +9895,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 234, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":235 + /* "common/params_pyx.pyx":241 * def get_default_value(self, key): * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) # <<<<<<<<<<<<<< @@ -9902,7 +9911,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc */ __pyx_v_t = __pyx_v_self->p->getKeyType(__pyx_v_k); - /* "common/params_pyx.pyx":236 + /* "common/params_pyx.pyx":242 * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) * cdef optional[string] default = self.p.getKeyDefaultValue(k) # <<<<<<<<<<<<<< @@ -9911,7 +9920,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc */ __pyx_v_default = __pyx_v_self->p->getKeyDefaultValue(__pyx_v_k); - /* "common/params_pyx.pyx":237 + /* "common/params_pyx.pyx":243 * cdef ParamKeyType t = self.p.getKeyType(k) * cdef optional[string] default = self.p.getKeyDefaultValue(k) * return self._cpp2python(t, default.value(), None, key) if default.has_value() else None # <<<<<<<<<<<<<< @@ -9923,15 +9932,15 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc if (__pyx_t_5) { __pyx_t_6 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_6); - __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 243, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); try { __pyx_t_8 = __pyx_v_default.value(); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 237, __pyx_L1_error) + __PYX_ERR(0, 243, __pyx_L1_error) } - __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 243, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_3 = 0; { @@ -9940,7 +9949,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 237, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 243, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); } __pyx_t_1 = __pyx_t_2; @@ -9953,7 +9962,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":233 + /* "common/params_pyx.pyx":239 * return self.p.allKeys() * * def get_default_value(self, key): # <<<<<<<<<<<<<< @@ -9976,7 +9985,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_36get_default_value(struc return __pyx_r; } -/* "common/params_pyx.pyx":239 +/* "common/params_pyx.pyx":245 * return self._cpp2python(t, default.value(), None, key) if default.has_value() else None * * def cpp2python(self, key, value): # <<<<<<<<<<<<<< @@ -10024,39 +10033,39 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,&__pyx_mstate_global->__pyx_n_u_value,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 239, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 245, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 2: values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 239, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 245, __pyx_L3_error) CYTHON_FALLTHROUGH; case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 239, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 245, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "cpp2python", 0) < 0) __PYX_ERR(0, 239, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "cpp2python", 0) < 0) __PYX_ERR(0, 245, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("cpp2python", 1, 2, 2, i); __PYX_ERR(0, 239, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("cpp2python", 1, 2, 2, i); __PYX_ERR(0, 245, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 239, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 245, __pyx_L3_error) values[1] = __Pyx_ArgRef_FASTCALL(__pyx_args, 1); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 239, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[1])) __PYX_ERR(0, 245, __pyx_L3_error) } __pyx_v_key = values[0]; __pyx_v_value = values[1]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cpp2python", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 239, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("cpp2python", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 245, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -10092,7 +10101,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx int __pyx_clineno = 0; __Pyx_RefNannySetupContext("cpp2python", 0); - /* "common/params_pyx.pyx":240 + /* "common/params_pyx.pyx":246 * * def cpp2python(self, key, value): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -10106,14 +10115,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 240, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 246, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 240, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 246, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":241 + /* "common/params_pyx.pyx":247 * def cpp2python(self, key, value): * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) # <<<<<<<<<<<<<< @@ -10122,7 +10131,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx */ __pyx_v_t = __pyx_v_self->p->getKeyType(__pyx_v_k); - /* "common/params_pyx.pyx":242 + /* "common/params_pyx.pyx":248 * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) * return self._cpp2python(t, value, None, key) # <<<<<<<<<<<<<< @@ -10132,7 +10141,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx __Pyx_XDECREF(__pyx_r); __pyx_t_2 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_2); - __pyx_t_5 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 242, __pyx_L1_error) + __pyx_t_5 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 248, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_3 = 0; { @@ -10140,14 +10149,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_cpp2python, __pyx_callargs+__pyx_t_3, (5-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":239 + /* "common/params_pyx.pyx":245 * return self._cpp2python(t, default.value(), None, key) if default.has_value() else None * * def cpp2python(self, key, value): # <<<<<<<<<<<<<< @@ -10168,7 +10177,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_38cpp2python(struct __pyx return __pyx_r; } -/* "common/params_pyx.pyx":245 +/* "common/params_pyx.pyx":251 * * # StarPilot variables * def get_key_flag(self, key): # <<<<<<<<<<<<<< @@ -10215,32 +10224,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 245, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 251, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 245, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 251, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_key_flag", 0) < 0) __PYX_ERR(0, 245, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_key_flag", 0) < 0) __PYX_ERR(0, 251, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_key_flag", 1, 1, 1, i); __PYX_ERR(0, 245, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_key_flag", 1, 1, 1, i); __PYX_ERR(0, 251, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 245, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 251, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_key_flag", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 245, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_key_flag", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 251, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -10273,7 +10282,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_40get_key_flag(struct __p int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_key_flag", 0); - /* "common/params_pyx.pyx":246 + /* "common/params_pyx.pyx":252 * # StarPilot variables * def get_key_flag(self, key): * return self.p.getKeyFlag(self.check_key(key)) # <<<<<<<<<<<<<< @@ -10288,18 +10297,18 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_40get_key_flag(struct __p PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 246, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 252, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 246, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 252, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(__pyx_v_self->p->getKeyFlag(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 246, __pyx_L1_error) + __pyx_t_1 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(__pyx_v_self->p->getKeyFlag(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 252, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":245 + /* "common/params_pyx.pyx":251 * * # StarPilot variables * def get_key_flag(self, key): # <<<<<<<<<<<<<< @@ -10319,7 +10328,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_40get_key_flag(struct __p return __pyx_r; } -/* "common/params_pyx.pyx":248 +/* "common/params_pyx.pyx":254 * return self.p.getKeyFlag(self.check_key(key)) * * def get_stock_value(self, key): # <<<<<<<<<<<<<< @@ -10366,32 +10375,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 248, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 254, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 248, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 254, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_stock_value", 0) < 0) __PYX_ERR(0, 248, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_stock_value", 0) < 0) __PYX_ERR(0, 254, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_stock_value", 1, 1, 1, i); __PYX_ERR(0, 248, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_stock_value", 1, 1, 1, i); __PYX_ERR(0, 254, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 248, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 254, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_stock_value", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 248, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_stock_value", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 254, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -10432,7 +10441,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_stock_value", 0); - /* "common/params_pyx.pyx":249 + /* "common/params_pyx.pyx":255 * * def get_stock_value(self, key): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -10446,14 +10455,14 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 249, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":250 + /* "common/params_pyx.pyx":256 * def get_stock_value(self, key): * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) # <<<<<<<<<<<<<< @@ -10462,7 +10471,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct */ __pyx_v_t = __pyx_v_self->p->getKeyType(__pyx_v_k); - /* "common/params_pyx.pyx":251 + /* "common/params_pyx.pyx":257 * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) * cdef optional[string] stock = self.p.getStockValue(k) # <<<<<<<<<<<<<< @@ -10471,7 +10480,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct */ __pyx_v_stock = __pyx_v_self->p->getStockValue(__pyx_v_k); - /* "common/params_pyx.pyx":252 + /* "common/params_pyx.pyx":258 * cdef ParamKeyType t = self.p.getKeyType(k) * cdef optional[string] stock = self.p.getStockValue(k) * return self._cpp2python(t, stock.value(), None, key) if stock.has_value() else None # <<<<<<<<<<<<<< @@ -10483,15 +10492,15 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct if (__pyx_t_5) { __pyx_t_6 = ((PyObject *)__pyx_v_self); __Pyx_INCREF(__pyx_t_6); - __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(__pyx_v_t); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); try { __pyx_t_8 = __pyx_v_stock.value(); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 252, __pyx_L1_error) + __PYX_ERR(0, 258, __pyx_L1_error) } - __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_9 = __pyx_convert_PyBytes_string_to_py_6libcpp_6string_std__in_string(__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_3 = 0; { @@ -10500,7 +10509,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); } __pyx_t_1 = __pyx_t_2; @@ -10513,7 +10522,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":248 + /* "common/params_pyx.pyx":254 * return self.p.getKeyFlag(self.check_key(key)) * * def get_stock_value(self, key): # <<<<<<<<<<<<<< @@ -10536,7 +10545,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_42get_stock_value(struct return __pyx_r; } -/* "common/params_pyx.pyx":254 +/* "common/params_pyx.pyx":260 * return self._cpp2python(t, stock.value(), None, key) if stock.has_value() else None * * def get_tuning_level(self, key): # <<<<<<<<<<<<<< @@ -10583,32 +10592,32 @@ PyObject *__pyx_args, PyObject *__pyx_kwds { PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; - if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 254, __pyx_L3_error) + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 260, __pyx_L3_error) if (__pyx_kwds_len > 0) { switch (__pyx_nargs) { case 1: values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 254, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 260, __pyx_L3_error) CYTHON_FALLTHROUGH; case 0: break; default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_tuning_level", 0) < 0) __PYX_ERR(0, 254, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_tuning_level", 0) < 0) __PYX_ERR(0, 260, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { - if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_tuning_level", 1, 1, 1, i); __PYX_ERR(0, 254, __pyx_L3_error) } + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_tuning_level", 1, 1, 1, i); __PYX_ERR(0, 260, __pyx_L3_error) } } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; } else { values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); - if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 254, __pyx_L3_error) + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 260, __pyx_L3_error) } __pyx_v_key = values[0]; } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_tuning_level", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 254, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_tuning_level", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 260, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -10645,7 +10654,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_tuning_level", 0); - /* "common/params_pyx.pyx":255 + /* "common/params_pyx.pyx":261 * * def get_tuning_level(self, key): * cdef string k = self.check_key(key) # <<<<<<<<<<<<<< @@ -10659,25 +10668,28 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 255, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 261, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); } - __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 255, __pyx_L1_error) + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 261, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4); - /* "common/params_pyx.pyx":256 + /* "common/params_pyx.pyx":262 * def get_tuning_level(self, key): * cdef string k = self.check_key(key) * cdef optional[int] level = self.p.getTuningLevel(k) # <<<<<<<<<<<<<< * return level.value() if level.has_value() else 0 + * */ __pyx_v_level = __pyx_v_self->p->getTuningLevel(__pyx_v_k); - /* "common/params_pyx.pyx":257 + /* "common/params_pyx.pyx":263 * cdef string k = self.check_key(key) * cdef optional[int] level = self.p.getTuningLevel(k) * return level.value() if level.has_value() else 0 # <<<<<<<<<<<<<< + * + * def get_settings_tier(self, key): */ __Pyx_XDECREF(__pyx_r); __pyx_t_5 = (__pyx_v_level.has_value() != 0); @@ -10686,9 +10698,9 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct __pyx_t_6 = __pyx_v_level.value(); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 257, __pyx_L1_error) + __PYX_ERR(0, 263, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyLong_From_int(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 257, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyLong_From_int(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 263, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = __pyx_t_2; __pyx_t_2 = 0; @@ -10700,7 +10712,7 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct __pyx_t_1 = 0; goto __pyx_L0; - /* "common/params_pyx.pyx":254 + /* "common/params_pyx.pyx":260 * return self._cpp2python(t, stock.value(), None, key) if stock.has_value() else None * * def get_tuning_level(self, key): # <<<<<<<<<<<<<< @@ -10719,6 +10731,153 @@ static PyObject *__pyx_pf_6common_10params_pyx_6Params_44get_tuning_level(struct __Pyx_RefNannyFinishContext(); return __pyx_r; } + +/* "common/params_pyx.pyx":265 + * return level.value() if level.has_value() else 0 + * + * def get_settings_tier(self, key): # <<<<<<<<<<<<<< + * return self.p.getSettingsTier(self.check_key(key)) +*/ + +/* Python wrapper */ +static PyObject *__pyx_pw_6common_10params_pyx_6Params_47get_settings_tier(PyObject *__pyx_v_self, +#if CYTHON_METH_FASTCALL +PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds +#else +PyObject *__pyx_args, PyObject *__pyx_kwds +#endif +); /*proto*/ +static PyMethodDef __pyx_mdef_6common_10params_pyx_6Params_47get_settings_tier = {"get_settings_tier", (PyCFunction)(void(*)(void))(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_6common_10params_pyx_6Params_47get_settings_tier, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; +static PyObject *__pyx_pw_6common_10params_pyx_6Params_47get_settings_tier(PyObject *__pyx_v_self, +#if CYTHON_METH_FASTCALL +PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds +#else +PyObject *__pyx_args, PyObject *__pyx_kwds +#endif +) { + PyObject *__pyx_v_key = 0; + #if !CYTHON_METH_FASTCALL + CYTHON_UNUSED Py_ssize_t __pyx_nargs; + #endif + CYTHON_UNUSED PyObject *const *__pyx_kwvalues; + PyObject* values[1] = {0}; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; + PyObject *__pyx_r = 0; + __Pyx_RefNannyDeclarations + __Pyx_RefNannySetupContext("get_settings_tier (wrapper)", 0); + #if !CYTHON_METH_FASTCALL + #if CYTHON_ASSUME_SAFE_SIZE + __pyx_nargs = PyTuple_GET_SIZE(__pyx_args); + #else + __pyx_nargs = PyTuple_Size(__pyx_args); if (unlikely(__pyx_nargs < 0)) return NULL; + #endif + #endif + __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs); + { + PyObject ** const __pyx_pyargnames[] = {&__pyx_mstate_global->__pyx_n_u_key,0}; + const Py_ssize_t __pyx_kwds_len = (__pyx_kwds) ? __Pyx_NumKwargs_FASTCALL(__pyx_kwds) : 0; + if (unlikely(__pyx_kwds_len) < 0) __PYX_ERR(0, 265, __pyx_L3_error) + if (__pyx_kwds_len > 0) { + switch (__pyx_nargs) { + case 1: + values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 265, __pyx_L3_error) + CYTHON_FALLTHROUGH; + case 0: break; + default: goto __pyx_L5_argtuple_error; + } + const Py_ssize_t kwd_pos_args = __pyx_nargs; + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "get_settings_tier", 0) < 0) __PYX_ERR(0, 265, __pyx_L3_error) + for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { + if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("get_settings_tier", 1, 1, 1, i); __PYX_ERR(0, 265, __pyx_L3_error) } + } + } else if (unlikely(__pyx_nargs != 1)) { + goto __pyx_L5_argtuple_error; + } else { + values[0] = __Pyx_ArgRef_FASTCALL(__pyx_args, 0); + if (!CYTHON_ASSUME_SAFE_MACROS && unlikely(!values[0])) __PYX_ERR(0, 265, __pyx_L3_error) + } + __pyx_v_key = values[0]; + } + goto __pyx_L6_skip; + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("get_settings_tier", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 265, __pyx_L3_error) + __pyx_L6_skip:; + goto __pyx_L4_argument_unpacking_done; + __pyx_L3_error:; + for (Py_ssize_t __pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) { + Py_XDECREF(values[__pyx_temp]); + } + __Pyx_AddTraceback("common.params_pyx.Params.get_settings_tier", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_RefNannyFinishContext(); + return NULL; + __pyx_L4_argument_unpacking_done:; + __pyx_r = __pyx_pf_6common_10params_pyx_6Params_46get_settings_tier(((struct __pyx_obj_6common_10params_pyx_Params *)__pyx_v_self), __pyx_v_key); + + /* function exit code */ + for (Py_ssize_t __pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) { + Py_XDECREF(values[__pyx_temp]); + } + __Pyx_RefNannyFinishContext(); + return __pyx_r; +} + +static PyObject *__pyx_pf_6common_10params_pyx_6Params_46get_settings_tier(struct __pyx_obj_6common_10params_pyx_Params *__pyx_v_self, PyObject *__pyx_v_key) { + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + size_t __pyx_t_3; + std::string __pyx_t_4; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; + __Pyx_RefNannySetupContext("get_settings_tier", 0); + + /* "common/params_pyx.pyx":266 + * + * def get_settings_tier(self, key): + * return self.p.getSettingsTier(self.check_key(key)) # <<<<<<<<<<<<<< +*/ + __Pyx_XDECREF(__pyx_r); + __pyx_t_2 = ((PyObject *)__pyx_v_self); + __Pyx_INCREF(__pyx_t_2); + __pyx_t_3 = 0; + { + PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_key}; + __pyx_t_1 = __Pyx_PyObject_FastCallMethod(__pyx_mstate_global->__pyx_n_u_check_key, __pyx_callargs+__pyx_t_3, (2-__pyx_t_3) | (1*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 266, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + } + __pyx_t_4 = __pyx_convert_string_from_py_6libcpp_6string_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 266, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_PyLong_From_enum__ParamSettingsTier(__pyx_v_self->p->getSettingsTier(__PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 266, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_r = __pyx_t_1; + __pyx_t_1 = 0; + goto __pyx_L0; + + /* "common/params_pyx.pyx":265 + * return level.value() if level.has_value() else 0 + * + * def get_settings_tier(self, key): # <<<<<<<<<<<<<< + * return self.p.getSettingsTier(self.check_key(key)) +*/ + + /* function exit code */ + __pyx_L1_error:; + __Pyx_XDECREF(__pyx_t_1); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_AddTraceback("common.params_pyx.Params.get_settings_tier", __pyx_clineno, __pyx_lineno, __pyx_filename); + __pyx_r = NULL; + __pyx_L0:; + __Pyx_XGIVEREF(__pyx_r); + __Pyx_RefNannyFinishContext(); + return __pyx_r; +} /* #### Code section: module_exttypes ### */ static PyObject *__pyx_tp_new_6common_10params_pyx_Params(PyTypeObject *t, PyObject *a, PyObject *k) { @@ -10794,6 +10953,7 @@ static PyMethodDef __pyx_methods_6common_10params_pyx_Params[] = { {"get_key_flag", (PyCFunction)(void(*)(void))(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_6common_10params_pyx_6Params_41get_key_flag, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}, {"get_stock_value", (PyCFunction)(void(*)(void))(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_6common_10params_pyx_6Params_43get_stock_value, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}, {"get_tuning_level", (PyCFunction)(void(*)(void))(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_6common_10params_pyx_6Params_45get_tuning_level, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}, + {"get_settings_tier", (PyCFunction)(void(*)(void))(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_6common_10params_pyx_6Params_47get_settings_tier, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}, {0, 0, 0, 0} }; #if CYTHON_USE_TYPE_SPECS @@ -10946,22 +11106,22 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0); /*--- Type init code ---*/ #if CYTHON_USE_TYPE_SPECS - __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_6common_10params_pyx_Params_spec, NULL); if (unlikely(!__pyx_mstate->__pyx_ptype_6common_10params_pyx_Params)) __PYX_ERR(0, 107, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_6common_10params_pyx_Params_spec, __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 107, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_6common_10params_pyx_Params_spec, NULL); if (unlikely(!__pyx_mstate->__pyx_ptype_6common_10params_pyx_Params)) __PYX_ERR(0, 113, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_6common_10params_pyx_Params_spec, __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 113, __pyx_L1_error) #else __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params = &__pyx_type_6common_10params_pyx_Params; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 107, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 113, __pyx_L1_error) #endif #if !CYTHON_COMPILING_IN_LIMITED_API if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_mstate->__pyx_ptype_6common_10params_pyx_Params->tp_dictoffset && __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params->tp_getattro == PyObject_GenericGetAttr)) { __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params->tp_getattro = PyObject_GenericGetAttr; } #endif - if (PyObject_SetAttr(__pyx_m, __pyx_mstate_global->__pyx_n_u_Params, (PyObject *) __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 107, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_mstate_global->__pyx_n_u_Params, (PyObject *) __pyx_mstate->__pyx_ptype_6common_10params_pyx_Params) < 0) __PYX_ERR(0, 113, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -11782,603 +11942,614 @@ __Pyx_RefNannySetupContext("PyInit_params_pyx", 0); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":59 + /* "common/params_pyx.pyx":65 * * PYTHON_2_CPP = { * (str, STRING): lambda v: v, # <<<<<<<<<<<<<< * (builtins.bool, BOOL): lambda v: "1" if v else "0", * (int, INT): str, */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 59, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(STRING); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 59, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(STRING); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyUnicode_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 59, __pyx_L1_error) + __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyUnicode_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6lambda, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[0])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 59, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6lambda, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[0])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":60 + /* "common/params_pyx.pyx":66 * PYTHON_2_CPP = { * (str, STRING): lambda v: v, * (builtins.bool, BOOL): lambda v: "1" if v else "0", # <<<<<<<<<<<<<< * (int, INT): str, * (float, FLOAT): str, */ - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_builtins); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 60, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_builtins); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_bool); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 60, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_bool); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BOOL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 60, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BOOL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = PyTuple_Pack(2, __pyx_t_8, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 60, __pyx_L1_error) + __pyx_t_7 = PyTuple_Pack(2, __pyx_t_8, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_7lambda1, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[1])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 60, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_7lambda1, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[1])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, __pyx_t_12) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, __pyx_t_12) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":61 + /* "common/params_pyx.pyx":67 * (str, STRING): lambda v: v, * (builtins.bool, BOOL): lambda v: "1" if v else "0", * (int, INT): str, # <<<<<<<<<<<<<< * (float, FLOAT): str, * (datetime.datetime, TIME): lambda v: v.isoformat(), */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(INT); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 61, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(INT); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = PyTuple_Pack(2, ((PyObject *)(&PyLong_Type)), __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 61, __pyx_L1_error) + __pyx_t_7 = PyTuple_Pack(2, ((PyObject *)(&PyLong_Type)), __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, ((PyObject *)(&PyUnicode_Type))) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, ((PyObject *)(&PyUnicode_Type))) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "common/params_pyx.pyx":62 + /* "common/params_pyx.pyx":68 * (builtins.bool, BOOL): lambda v: "1" if v else "0", * (int, INT): str, * (float, FLOAT): str, # <<<<<<<<<<<<<< * (datetime.datetime, TIME): lambda v: v.isoformat(), * (dict, JSON): json.dumps, */ - __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(FLOAT); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 62, __pyx_L1_error) + __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(FLOAT); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 68, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_12 = PyTuple_Pack(2, ((PyObject *)(&PyFloat_Type)), __pyx_t_7); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 62, __pyx_L1_error) + __pyx_t_12 = PyTuple_Pack(2, ((PyObject *)(&PyFloat_Type)), __pyx_t_7); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 68, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, ((PyObject *)(&PyUnicode_Type))) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, ((PyObject *)(&PyUnicode_Type))) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":63 + /* "common/params_pyx.pyx":69 * (int, INT): str, * (float, FLOAT): str, * (datetime.datetime, TIME): lambda v: v.isoformat(), # <<<<<<<<<<<<<< * (dict, JSON): json.dumps, * (list, JSON): json.dumps, */ - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 63, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 63, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_datetime); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(TIME); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 63, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(TIME); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = PyTuple_Pack(2, __pyx_t_7, __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 63, __pyx_L1_error) + __pyx_t_8 = PyTuple_Pack(2, __pyx_t_7, __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_8lambda2, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[2])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 63, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_8lambda2, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[2])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":64 + /* "common/params_pyx.pyx":70 * (float, FLOAT): str, * (datetime.datetime, TIME): lambda v: v.isoformat(), * (dict, JSON): json.dumps, # <<<<<<<<<<<<<< * (list, JSON): json.dumps, * (bytes, BYTES): lambda v: v, */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 64, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyDict_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 64, __pyx_L1_error) + __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyDict_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 64, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_dumps); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 64, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_dumps); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_7) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_7) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "common/params_pyx.pyx":65 + /* "common/params_pyx.pyx":71 * (datetime.datetime, TIME): lambda v: v.isoformat(), * (dict, JSON): json.dumps, * (list, JSON): json.dumps, # <<<<<<<<<<<<<< * (bytes, BYTES): lambda v: v, * } */ - __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 65, __pyx_L1_error) + __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyList_Type)), __pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 65, __pyx_L1_error) + __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyList_Type)), __pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 65, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_dumps); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 65, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_dumps); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":66 + /* "common/params_pyx.pyx":72 * (dict, JSON): json.dumps, * (list, JSON): json.dumps, * (bytes, BYTES): lambda v: v, # <<<<<<<<<<<<<< * } * */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BYTES); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 66, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BYTES); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 72, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyBytes_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 66, __pyx_L1_error) + __pyx_t_8 = PyTuple_Pack(2, ((PyObject *)(&PyBytes_Type)), __pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 72, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_9lambda3, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[3])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 66, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_9lambda3, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[3])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 72, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 59, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_PYTHON_2_CPP, __pyx_t_4) < 0) __PYX_ERR(0, 58, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_PYTHON_2_CPP, __pyx_t_4) < 0) __PYX_ERR(0, 64, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":70 + /* "common/params_pyx.pyx":76 * * * def _decode_int(v): # <<<<<<<<<<<<<< * decoded = v.decode("utf-8") * try: */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_1_decode_int, 0, __pyx_mstate_global->__pyx_n_u_decode_int, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[4])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 70, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_1_decode_int, 0, __pyx_mstate_global->__pyx_n_u_decode_int, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[4])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 76, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_decode_int, __pyx_t_4) < 0) __PYX_ERR(0, 70, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_decode_int, __pyx_t_4) < 0) __PYX_ERR(0, 76, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":78 + /* "common/params_pyx.pyx":84 * * * def _decode_time(v): # <<<<<<<<<<<<<< * decoded = v.decode("utf-8") * try: */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_3_decode_time, 0, __pyx_mstate_global->__pyx_n_u_decode_time, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[5])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 78, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_3_decode_time, 0, __pyx_mstate_global->__pyx_n_u_decode_time, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[5])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 84, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_decode_time, __pyx_t_4) < 0) __PYX_ERR(0, 78, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_decode_time, __pyx_t_4) < 0) __PYX_ERR(0, 84, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":92 + /* "common/params_pyx.pyx":98 * * CPP_2_PYTHON = { * STRING: lambda v: v.decode("utf-8"), # <<<<<<<<<<<<<< * BOOL: lambda v: v == b"1", * INT: _decode_int, */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 92, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(STRING); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 92, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(STRING); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_8 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_10lambda4, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[6])); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 92, __pyx_L1_error) + __pyx_t_8 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_10lambda4, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[6])); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_8) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_8) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "common/params_pyx.pyx":93 + /* "common/params_pyx.pyx":99 * CPP_2_PYTHON = { * STRING: lambda v: v.decode("utf-8"), * BOOL: lambda v: v == b"1", # <<<<<<<<<<<<<< * INT: _decode_int, * FLOAT: float, */ - __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BOOL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 93, __pyx_L1_error) + __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BOOL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 99, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_11lambda5, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[7])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 93, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_11lambda5, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[7])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 99, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":94 + /* "common/params_pyx.pyx":100 * STRING: lambda v: v.decode("utf-8"), * BOOL: lambda v: v == b"1", * INT: _decode_int, # <<<<<<<<<<<<<< * FLOAT: float, * TIME: _decode_time, */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(INT); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 94, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(INT); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 100, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_decode_int); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 94, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_decode_int); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 100, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_8) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_8) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "common/params_pyx.pyx":95 + /* "common/params_pyx.pyx":101 * BOOL: lambda v: v == b"1", * INT: _decode_int, * FLOAT: float, # <<<<<<<<<<<<<< * TIME: _decode_time, * JSON: json.loads, */ - __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(FLOAT); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 95, __pyx_L1_error) + __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(FLOAT); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 101, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, ((PyObject *)(&PyFloat_Type))) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, ((PyObject *)(&PyFloat_Type))) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "common/params_pyx.pyx":96 + /* "common/params_pyx.pyx":102 * INT: _decode_int, * FLOAT: float, * TIME: _decode_time, # <<<<<<<<<<<<<< * JSON: json.loads, * BYTES: lambda v: v, */ - __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(TIME); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 96, __pyx_L1_error) + __pyx_t_8 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(TIME); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 102, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_decode_time); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 96, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_mstate_global->__pyx_n_u_decode_time); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 102, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_8, __pyx_t_12) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":97 + /* "common/params_pyx.pyx":103 * FLOAT: float, * TIME: _decode_time, * JSON: json.loads, # <<<<<<<<<<<<<< * BYTES: lambda v: v, * } */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 97, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(JSON); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 103, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 97, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_json); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 103, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_loads); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 97, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_mstate_global->__pyx_n_u_loads); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 103, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_7) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_12, __pyx_t_7) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "common/params_pyx.pyx":98 + /* "common/params_pyx.pyx":104 * TIME: _decode_time, * JSON: json.loads, * BYTES: lambda v: v, # <<<<<<<<<<<<<< * } * */ - __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BYTES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 98, __pyx_L1_error) + __pyx_t_7 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyType_to_py(BYTES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 104, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_12lambda6, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[8])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 98, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_12lambda6, 0, __pyx_mstate_global->__pyx_n_u_lambda, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[8])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 104, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, __pyx_t_12) < 0) __PYX_ERR(0, 92, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_t_7, __pyx_t_12) < 0) __PYX_ERR(0, 98, __pyx_L1_error) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_CPP_2_PYTHON, __pyx_t_4) < 0) __PYX_ERR(0, 91, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_CPP_2_PYTHON, __pyx_t_4) < 0) __PYX_ERR(0, 97, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":101 + /* "common/params_pyx.pyx":107 * } * * def ensure_bytes(v): # <<<<<<<<<<<<<< * return v.encode() if isinstance(v, str) else v * */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_5ensure_bytes, 0, __pyx_mstate_global->__pyx_n_u_ensure_bytes, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[9])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 101, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_5ensure_bytes, 0, __pyx_mstate_global->__pyx_n_u_ensure_bytes, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[9])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 107, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_ensure_bytes, __pyx_t_4) < 0) __PYX_ERR(0, 101, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_ensure_bytes, __pyx_t_4) < 0) __PYX_ERR(0, 107, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "common/params_pyx.pyx":104 + /* "common/params_pyx.pyx":110 * return v.encode() if isinstance(v, str) else v * * class UnknownKeyName(Exception): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_4 = PyTuple_Pack(1, ((PyObject *)(((PyTypeObject*)PyExc_Exception)))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 104, __pyx_L1_error) + __pyx_t_4 = PyTuple_Pack(1, ((PyObject *)(((PyTypeObject*)PyExc_Exception)))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_12 = __Pyx_PEP560_update_bases(__pyx_t_4); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 104, __pyx_L1_error) + __pyx_t_12 = __Pyx_PEP560_update_bases(__pyx_t_4); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = __Pyx_CalculateMetaclass(NULL, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 104, __pyx_L1_error) + __pyx_t_7 = __Pyx_CalculateMetaclass(NULL, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = __Pyx_Py3MetaclassPrepare(__pyx_t_7, __pyx_t_12, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, (PyObject *) NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, (PyObject *) NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 104, __pyx_L1_error) + __pyx_t_8 = __Pyx_Py3MetaclassPrepare(__pyx_t_7, __pyx_t_12, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, (PyObject *) NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, (PyObject *) NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_12 != __pyx_t_4) { - if (unlikely((PyDict_SetItemString(__pyx_t_8, "__orig_bases__", __pyx_t_4) < 0))) __PYX_ERR(0, 104, __pyx_L1_error) + if (unlikely((PyDict_SetItemString(__pyx_t_8, "__orig_bases__", __pyx_t_4) < 0))) __PYX_ERR(0, 110, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_t_12, __pyx_t_8, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 104, __pyx_L1_error) + __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_7, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_t_12, __pyx_t_8, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_t_4) < 0) __PYX_ERR(0, 104, __pyx_L1_error) + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_UnknownKeyName, __pyx_t_4) < 0) __PYX_ERR(0, 110, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":130 + /* "common/params_pyx.pyx":136 * self.return_defaults = return_defaults or memory * * def __reduce__(self): # <<<<<<<<<<<<<< * return (type(self), (self.d, self.m, self.return_defaults)) * */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_3__reduce__, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params___reduce, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[10])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 130, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_3__reduce__, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params___reduce, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[10])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 136, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_reduce, __pyx_t_12) < 0) __PYX_ERR(0, 130, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_reduce, __pyx_t_12) < 0) __PYX_ERR(0, 136, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":136 + /* "common/params_pyx.pyx":142 * del self.p * * def clear_all(self, tx_flag=ParamKeyFlag.ALL): # <<<<<<<<<<<<<< * self.p.clearAll(tx_flag) * */ - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(ALL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(ALL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 142, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __pyx_mstate_global->__pyx_k__2 = __pyx_t_12; __Pyx_GIVEREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(ALL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_12 = __Pyx_Enum_6common_10params_pyx_enum__space_ParamKeyFlag_to_py(ALL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 142, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_7 = PyTuple_Pack(1, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_7 = PyTuple_Pack(1, __pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 142, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_7clear_all, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_clear_all, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[11])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_7clear_all, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_clear_all, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[11])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 142, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_12, __pyx_t_7); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_clear_all, __pyx_t_12) < 0) __PYX_ERR(0, 136, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_clear_all, __pyx_t_12) < 0) __PYX_ERR(0, 142, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":139 + /* "common/params_pyx.pyx":145 * self.p.clearAll(tx_flag) * * def check_key(self, key): # <<<<<<<<<<<<<< * key = ensure_bytes(key) * if not self.p.checkKey(key): */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_9check_key, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_check_key, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[12])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 139, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_9check_key, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_check_key, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[12])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 145, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_check_key, __pyx_t_12) < 0) __PYX_ERR(0, 139, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_check_key, __pyx_t_12) < 0) __PYX_ERR(0, 145, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":145 + /* "common/params_pyx.pyx":151 * return key * * def python2cpp(self, proposed_type, expected_type, value, key): # <<<<<<<<<<<<<< * cast = PYTHON_2_CPP.get((proposed_type, expected_type)) * if cast: */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_11python2cpp, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_python2cpp, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[13])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 145, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_11python2cpp, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_python2cpp, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[13])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_python2cpp, __pyx_t_12) < 0) __PYX_ERR(0, 145, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_python2cpp, __pyx_t_12) < 0) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":151 + /* "common/params_pyx.pyx":157 * raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}") * * def _cpp2python(self, t, value, default, key): # <<<<<<<<<<<<<< * if value is None: * return None */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_13_cpp2python, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params__cpp2python, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[14])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 151, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_13_cpp2python, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params__cpp2python, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[14])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 157, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_cpp2python, __pyx_t_12) < 0) __PYX_ERR(0, 151, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_cpp2python, __pyx_t_12) < 0) __PYX_ERR(0, 157, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":160 + /* "common/params_pyx.pyx":166 * return self._cpp2python(t, default, None, key) * * def get(self, key, bool block=False, bool return_default=False): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_15get, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[15])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 160, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_15get, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[15])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_12, __pyx_mstate_global->__pyx_tuple[2]); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get, __pyx_t_12) < 0) __PYX_ERR(0, 160, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get, __pyx_t_12) < 0) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":178 + /* "common/params_pyx.pyx":184 * return self._cpp2python(t, val, default_val, key) * * def get_bool(self, key, bool block=False): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef bool r */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_17get_bool, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_bool, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[16])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 178, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_17get_bool, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_bool, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[16])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_12, __pyx_mstate_global->__pyx_tuple[3]); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_bool, __pyx_t_12) < 0) __PYX_ERR(0, 178, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_bool, __pyx_t_12) < 0) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":185 + /* "common/params_pyx.pyx":191 * return r * * def _put_cast(self, key, dat): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_19_put_cast, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params__put_cast, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[17])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_19_put_cast, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params__put_cast, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[17])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 191, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_cast, __pyx_t_12) < 0) __PYX_ERR(0, 185, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_cast, __pyx_t_12) < 0) __PYX_ERR(0, 191, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":190 + /* "common/params_pyx.pyx":196 * return ensure_bytes(self.python2cpp(type(dat), t, dat, key)) * * def put(self, key, dat): # <<<<<<<<<<<<<< * """ * Warning: This function blocks until the param is written to disk! */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_21put, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[18])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_21put, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[18])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 196, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put, __pyx_t_12) < 0) __PYX_ERR(0, 190, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put, __pyx_t_12) < 0) __PYX_ERR(0, 196, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":202 + /* "common/params_pyx.pyx":208 * self.p.put(k, dat_bytes) * * def put_bool(self, key, bool val): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * with nogil: */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_23put_bool, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_bool, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[19])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_23put_bool, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_bool, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[19])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_bool, __pyx_t_12) < 0) __PYX_ERR(0, 202, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_bool, __pyx_t_12) < 0) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":207 + /* "common/params_pyx.pyx":213 * self.p.putBool(k, val) * * def put_nonblocking(self, key, dat): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef string dat_bytes = self._put_cast(key, dat) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_25put_nonblocking, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_nonblocking, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[20])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 207, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_25put_nonblocking, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_nonblocking, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[20])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 213, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_nonblocking, __pyx_t_12) < 0) __PYX_ERR(0, 207, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_nonblocking, __pyx_t_12) < 0) __PYX_ERR(0, 213, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":213 + /* "common/params_pyx.pyx":219 * self.p.putNonBlocking(k, dat_bytes) * * def put_bool_nonblocking(self, key, bool val): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * with nogil: */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_27put_bool_nonblocking, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_bool_nonblocking, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[21])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 213, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_27put_bool_nonblocking, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_put_bool_nonblocking, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[21])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_bool_nonblocking, __pyx_t_12) < 0) __PYX_ERR(0, 213, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_put_bool_nonblocking, __pyx_t_12) < 0) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":218 + /* "common/params_pyx.pyx":224 * self.p.putBoolNonBlocking(k, val) * * def remove(self, key): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * with nogil: */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_29remove, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_remove, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[22])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 218, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_29remove, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_remove, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[22])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 224, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_remove, __pyx_t_12) < 0) __PYX_ERR(0, 218, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_remove, __pyx_t_12) < 0) __PYX_ERR(0, 224, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":223 + /* "common/params_pyx.pyx":229 * self.p.remove(k) * * def get_param_path(self, key=""): # <<<<<<<<<<<<<< * cdef string key_bytes = ensure_bytes(key) * return self.p.getParamPath(key_bytes).decode("utf-8") */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_31get_param_path, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_param_path, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[23])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 223, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_31get_param_path, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_param_path, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[23])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_12, __pyx_mstate_global->__pyx_tuple[4]); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_param_path, __pyx_t_12) < 0) __PYX_ERR(0, 223, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_param_path, __pyx_t_12) < 0) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":227 + /* "common/params_pyx.pyx":233 * return self.p.getParamPath(key_bytes).decode("utf-8") * * def get_type(self, key): # <<<<<<<<<<<<<< * return self.p.getKeyType(self.check_key(key)) * */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_33get_type, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_type, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[24])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_33get_type, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_type, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[24])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 233, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_type, __pyx_t_12) < 0) __PYX_ERR(0, 227, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_type, __pyx_t_12) < 0) __PYX_ERR(0, 233, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":230 + /* "common/params_pyx.pyx":236 * return self.p.getKeyType(self.check_key(key)) * * def all_keys(self): # <<<<<<<<<<<<<< * return self.p.allKeys() * */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_35all_keys, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_all_keys, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[25])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_35all_keys, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_all_keys, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[25])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_all_keys, __pyx_t_12) < 0) __PYX_ERR(0, 230, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_all_keys, __pyx_t_12) < 0) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":233 + /* "common/params_pyx.pyx":239 * return self.p.allKeys() * * def get_default_value(self, key): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_37get_default_value, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_default_value, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[26])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_37get_default_value, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_default_value, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[26])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_default_value, __pyx_t_12) < 0) __PYX_ERR(0, 233, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_default_value, __pyx_t_12) < 0) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":239 + /* "common/params_pyx.pyx":245 * return self._cpp2python(t, default.value(), None, key) if default.has_value() else None * * def cpp2python(self, key, value): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_39cpp2python, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_cpp2python, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[27])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_39cpp2python, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_cpp2python, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[27])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 245, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_cpp2python_2, __pyx_t_12) < 0) __PYX_ERR(0, 239, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_cpp2python_2, __pyx_t_12) < 0) __PYX_ERR(0, 245, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":245 + /* "common/params_pyx.pyx":251 * * # StarPilot variables * def get_key_flag(self, key): # <<<<<<<<<<<<<< * return self.p.getKeyFlag(self.check_key(key)) * */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_41get_key_flag, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_key_flag, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[28])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_41get_key_flag, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_key_flag, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[28])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_key_flag, __pyx_t_12) < 0) __PYX_ERR(0, 245, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_key_flag, __pyx_t_12) < 0) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":248 + /* "common/params_pyx.pyx":254 * return self.p.getKeyFlag(self.check_key(key)) * * def get_stock_value(self, key): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_43get_stock_value, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_stock_value, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[29])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 248, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_43get_stock_value, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_stock_value, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[29])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 254, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_stock_value, __pyx_t_12) < 0) __PYX_ERR(0, 248, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_stock_value, __pyx_t_12) < 0) __PYX_ERR(0, 254, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - /* "common/params_pyx.pyx":254 + /* "common/params_pyx.pyx":260 * return self._cpp2python(t, stock.value(), None, key) if stock.has_value() else None * * def get_tuning_level(self, key): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef optional[int] level = self.p.getTuningLevel(k) */ - __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_45get_tuning_level, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_tuning_level, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[30])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 254, __pyx_L1_error) + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_45get_tuning_level, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_tuning_level, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[30])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 260, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_tuning_level, __pyx_t_12) < 0) __PYX_ERR(0, 254, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_tuning_level, __pyx_t_12) < 0) __PYX_ERR(0, 260, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; + + /* "common/params_pyx.pyx":265 + * return level.value() if level.has_value() else 0 + * + * def get_settings_tier(self, key): # <<<<<<<<<<<<<< + * return self.p.getSettingsTier(self.check_key(key)) +*/ + __pyx_t_12 = __Pyx_CyFunction_New(&__pyx_mdef_6common_10params_pyx_6Params_47get_settings_tier, __Pyx_CYFUNCTION_CCLASS, __pyx_mstate_global->__pyx_n_u_Params_get_settings_tier, NULL, __pyx_mstate_global->__pyx_n_u_common_params_pyx, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[31])); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 265, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_12); + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_ptype_6common_10params_pyx_Params, __pyx_mstate_global->__pyx_n_u_get_settings_tier, __pyx_t_12) < 0) __PYX_ERR(0, 265, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; /* "common/params_pyx.pyx":1 @@ -12502,6 +12673,7 @@ static const __Pyx_StringTabEntry __pyx_string_tab[] = { {__pyx_k_Params_get_default_value, sizeof(__pyx_k_Params_get_default_value), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_default_value */ {__pyx_k_Params_get_key_flag, sizeof(__pyx_k_Params_get_key_flag), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_key_flag */ {__pyx_k_Params_get_param_path, sizeof(__pyx_k_Params_get_param_path), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_param_path */ + {__pyx_k_Params_get_settings_tier, sizeof(__pyx_k_Params_get_settings_tier), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_settings_tier */ {__pyx_k_Params_get_stock_value, sizeof(__pyx_k_Params_get_stock_value), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_stock_value */ {__pyx_k_Params_get_tuning_level, sizeof(__pyx_k_Params_get_tuning_level), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_tuning_level */ {__pyx_k_Params_get_type, sizeof(__pyx_k_Params_get_type), 0, 1, 1}, /* PyObject cname: __pyx_n_u_Params_get_type */ @@ -12564,6 +12736,7 @@ static const __Pyx_StringTabEntry __pyx_string_tab[] = { {__pyx_k_get_default_value, sizeof(__pyx_k_get_default_value), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_default_value */ {__pyx_k_get_key_flag, sizeof(__pyx_k_get_key_flag), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_key_flag */ {__pyx_k_get_param_path, sizeof(__pyx_k_get_param_path), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_param_path */ + {__pyx_k_get_settings_tier, sizeof(__pyx_k_get_settings_tier), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_settings_tier */ {__pyx_k_get_stock_value, sizeof(__pyx_k_get_stock_value), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_stock_value */ {__pyx_k_get_tuning_level, sizeof(__pyx_k_get_tuning_level), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_tuning_level */ {__pyx_k_get_type, sizeof(__pyx_k_get_type), 0, 1, 1}, /* PyObject cname: __pyx_n_u_get_type */ @@ -12629,10 +12802,10 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry const *t, PyObject **target, c static int __Pyx_InitCachedBuiltins(__pyx_mstatetype *__pyx_mstate) { CYTHON_UNUSED_VAR(__pyx_mstate); - __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 74, __pyx_L1_error) - __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 149, __pyx_L1_error) - __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_KeyError); if (!__pyx_builtin_KeyError) __PYX_ERR(0, 156, __pyx_L1_error) - __pyx_builtin_KeyboardInterrupt = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_KeyboardInterrupt); if (!__pyx_builtin_KeyboardInterrupt) __PYX_ERR(0, 173, __pyx_L1_error) + __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 80, __pyx_L1_error) + __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 155, __pyx_L1_error) + __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_KeyError); if (!__pyx_builtin_KeyError) __PYX_ERR(0, 162, __pyx_L1_error) + __pyx_builtin_KeyboardInterrupt = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_KeyboardInterrupt); if (!__pyx_builtin_KeyboardInterrupt) __PYX_ERR(0, 179, __pyx_L1_error) __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 79, __pyx_L1_error) __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_range); if (!__pyx_builtin_range) __PYX_ERR(1, 87, __pyx_L1_error) return 0; @@ -12646,14 +12819,14 @@ static int __Pyx_InitCachedConstants(__pyx_mstatetype *__pyx_mstate) { CYTHON_UNUSED_VAR(__pyx_mstate); __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "common/params_pyx.pyx":83 + /* "common/params_pyx.pyx":89 * return datetime.datetime.fromisoformat(decoded) * except ValueError: * for fmt in ("%B %d, %Y - %I:%M%p", "%B %d, %Y - %I:%M %p"): # <<<<<<<<<<<<<< * try: * return datetime.datetime.strptime(decoded, fmt) */ - __pyx_mstate_global->__pyx_tuple[0] = PyTuple_Pack(2, __pyx_mstate_global->__pyx_kp_u_B_d_Y_I_M_p, __pyx_mstate_global->__pyx_kp_u_B_d_Y_I_M_p_2); if (unlikely(!__pyx_mstate_global->__pyx_tuple[0])) __PYX_ERR(0, 83, __pyx_L1_error) + __pyx_mstate_global->__pyx_tuple[0] = PyTuple_Pack(2, __pyx_mstate_global->__pyx_kp_u_B_d_Y_I_M_p, __pyx_mstate_global->__pyx_kp_u_B_d_Y_I_M_p_2); if (unlikely(!__pyx_mstate_global->__pyx_tuple[0])) __PYX_ERR(0, 89, __pyx_L1_error) __Pyx_GOTREF(__pyx_mstate_global->__pyx_tuple[0]); __Pyx_GIVEREF(__pyx_mstate_global->__pyx_tuple[0]); @@ -12668,36 +12841,36 @@ static int __Pyx_InitCachedConstants(__pyx_mstatetype *__pyx_mstate) { __Pyx_GOTREF(__pyx_mstate_global->__pyx_tuple[1]); __Pyx_GIVEREF(__pyx_mstate_global->__pyx_tuple[1]); - /* "common/params_pyx.pyx":160 + /* "common/params_pyx.pyx":166 * return self._cpp2python(t, default, None, key) * * def get(self, key, bool block=False, bool return_default=False): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef ParamKeyType t = self.p.getKeyType(k) */ - __pyx_mstate_global->__pyx_tuple[2] = PyTuple_Pack(2, Py_False, Py_False); if (unlikely(!__pyx_mstate_global->__pyx_tuple[2])) __PYX_ERR(0, 160, __pyx_L1_error) + __pyx_mstate_global->__pyx_tuple[2] = PyTuple_Pack(2, Py_False, Py_False); if (unlikely(!__pyx_mstate_global->__pyx_tuple[2])) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_mstate_global->__pyx_tuple[2]); __Pyx_GIVEREF(__pyx_mstate_global->__pyx_tuple[2]); - /* "common/params_pyx.pyx":178 + /* "common/params_pyx.pyx":184 * return self._cpp2python(t, val, default_val, key) * * def get_bool(self, key, bool block=False): # <<<<<<<<<<<<<< * cdef string k = self.check_key(key) * cdef bool r */ - __pyx_mstate_global->__pyx_tuple[3] = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_mstate_global->__pyx_tuple[3])) __PYX_ERR(0, 178, __pyx_L1_error) + __pyx_mstate_global->__pyx_tuple[3] = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_mstate_global->__pyx_tuple[3])) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_mstate_global->__pyx_tuple[3]); __Pyx_GIVEREF(__pyx_mstate_global->__pyx_tuple[3]); - /* "common/params_pyx.pyx":223 + /* "common/params_pyx.pyx":229 * self.p.remove(k) * * def get_param_path(self, key=""): # <<<<<<<<<<<<<< * cdef string key_bytes = ensure_bytes(key) * return self.p.getParamPath(key_bytes).decode("utf-8") */ - __pyx_mstate_global->__pyx_tuple[4] = PyTuple_Pack(1, __pyx_mstate_global->__pyx_kp_u_); if (unlikely(!__pyx_mstate_global->__pyx_tuple[4])) __PYX_ERR(0, 223, __pyx_L1_error) + __pyx_mstate_global->__pyx_tuple[4] = PyTuple_Pack(1, __pyx_mstate_global->__pyx_kp_u_); if (unlikely(!__pyx_mstate_global->__pyx_tuple[4])) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_mstate_global->__pyx_tuple[4]); __Pyx_GIVEREF(__pyx_mstate_global->__pyx_tuple[4]); __Pyx_RefNannyFinishContext(); @@ -12726,7 +12899,7 @@ static int __Pyx_InitConstants(__pyx_mstatetype *__pyx_mstate) { unsigned int num_kwonly_args : 1; unsigned int nlocals : 4; unsigned int flags : 10; - unsigned int first_line : 8; + unsigned int first_line : 9; unsigned int line_table_length : 12; } __Pyx_PyCode_New_function_description; /* NewCodeObj.proto */ @@ -12744,160 +12917,165 @@ static int __Pyx_CreateCodeObjects(__pyx_mstatetype *__pyx_mstate) { PyObject* tuple_dedup_map = PyDict_New(); if (unlikely(!tuple_dedup_map)) return -1; { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 59, 4}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 65, 4}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[0] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_1_2, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[0])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 60, 8}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 66, 8}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[1] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_7, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[1])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 63, 8}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 69, 8}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[2] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_Zq, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[2])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 66, 4}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 72, 4}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[3] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[3])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 70, 41}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 76, 41}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v, __pyx_mstate->__pyx_n_u_decoded}; __pyx_mstate_global->__pyx_codeobj_tab[4] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_decode_int, __pyx_k_AWAQ_3aq_3auAQ, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[4])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 78, 68}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 84, 68}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v, __pyx_mstate->__pyx_n_u_decoded, __pyx_mstate->__pyx_n_u_fmt}; __pyx_mstate_global->__pyx_codeobj_tab[5] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_decode_time, __pyx_k_AWAQ_89N_1_q_q_xy_1, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[5])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 92, 10}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 98, 10}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[6] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_AWAQ, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[6])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 93, 8}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 99, 8}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[7] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_Cq, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[7])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 98, 4}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 104, 4}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[8] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_lambda, __pyx_k_1_3, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[8])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 101, 21}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 107, 21}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_v}; __pyx_mstate_global->__pyx_codeobj_tab[9] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_ensure_bytes, __pyx_k_z_Zq, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[9])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 130, 23}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 136, 23}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self}; __pyx_mstate_global->__pyx_codeobj_tab[10] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_reduce, __pyx_k_D_T_T_Q, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[10])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 136, 16}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 142, 16}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_tx_flag}; __pyx_mstate_global->__pyx_codeobj_tab[11] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_clear_all, __pyx_k_1A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[11])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 139, 40}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 145, 40}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key}; __pyx_mstate_global->__pyx_codeobj_tab[12] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_check_key, __pyx_k_aq_t4r_1_N_1_1, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[12])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {5, 0, 0, 6, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 145, 52}; + const __Pyx_PyCode_New_function_description descr = {5, 0, 0, 6, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 151, 52}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_proposed_type, __pyx_mstate->__pyx_n_u_expected_type, __pyx_mstate->__pyx_n_u_value, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_cast}; __pyx_mstate_global->__pyx_codeobj_tab[13] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_python2cpp, __pyx_k_t2_A_q_T_1B_GCTTeef, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[13])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {5, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 151, 76}; + const __Pyx_PyCode_New_function_description descr = {5, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 157, 76}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_t, __pyx_mstate->__pyx_n_u_value, __pyx_mstate->__pyx_n_u_default, __pyx_mstate->__pyx_n_u_key}; __pyx_mstate_global->__pyx_codeobj_tab[14] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_cpp2python, __pyx_k_vS_Q_AQ_k_har_2_PPQ_T_Qc, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[14])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {4, 0, 0, 9, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 160, 169}; + const __Pyx_PyCode_New_function_description descr = {4, 0, 0, 9, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 166, 169}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_block, __pyx_mstate->__pyx_n_u_return_default, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_t, __pyx_mstate->__pyx_n_u_default, __pyx_mstate->__pyx_n_u_val, __pyx_mstate->__pyx_n_u_default_val}; __pyx_mstate_global->__pyx_codeobj_tab[15] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get, __pyx_k_1_D_1_b_1A_D_Qa_D_as_7_gZxz_X, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[15])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 178, 39}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 184, 39}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_block, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_r}; __pyx_mstate_global->__pyx_codeobj_tab[16] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_bool, __pyx_k_Q_D_1_b_A_1, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[16])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 185, 51}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 191, 51}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_dat, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_t}; __pyx_mstate_global->__pyx_codeobj_tab[17] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_put_cast, __pyx_k_D_1_b_1A_q_Kq_AV3e1, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[17])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 190, 44}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 196, 44}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_dat, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_dat_bytes}; __pyx_mstate_global->__pyx_codeobj_tab[18] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_put, __pyx_k_D_1_D_5_D_A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[18])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 202, 29}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 208, 29}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_val, __pyx_mstate->__pyx_n_u_k}; __pyx_mstate_global->__pyx_codeobj_tab[19] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_put_bool, __pyx_k_D_1_HAS, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[19])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 207, 42}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 213, 42}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_dat, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_dat_bytes}; __pyx_mstate_global->__pyx_codeobj_tab[20] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_put_nonblocking, __pyx_k_D_1_D_5_O1Cq, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[20])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 213, 30}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 219, 30}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_val, __pyx_mstate->__pyx_n_u_k}; __pyx_mstate_global->__pyx_codeobj_tab[21] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_put_bool_nonblocking, __pyx_k_D_1_q_1, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[21])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 218, 27}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 224, 27}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_k}; __pyx_mstate_global->__pyx_codeobj_tab[22] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_remove, __pyx_k_D_1_G1A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[22])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 223, 33}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 3, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 229, 33}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_key_bytes}; __pyx_mstate_global->__pyx_codeobj_tab[23] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_param_path, __pyx_k_q_L_4r_az, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[23])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 227, 21}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 233, 21}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key}; __pyx_mstate_global->__pyx_codeobj_tab[24] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_type, __pyx_k_4r_AT_1A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[24])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 230, 13}; + const __Pyx_PyCode_New_function_description descr = {1, 0, 0, 1, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 236, 13}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self}; __pyx_mstate_global->__pyx_codeobj_tab[25] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_all_keys, __pyx_k_4r, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[25])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 233, 70}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 239, 70}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_t, __pyx_mstate->__pyx_n_u_default}; __pyx_mstate_global->__pyx_codeobj_tab[26] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_default_value, __pyx_k_D_1_b_1A_D_Qa_4_1CwfD_hgZxWX, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[26])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 239, 43}; + const __Pyx_PyCode_New_function_description descr = {3, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 245, 43}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_value, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_t}; __pyx_mstate_global->__pyx_codeobj_tab[27] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_cpp2python_2, __pyx_k_D_1_b_1A_4_1CwfA, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[27])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 245, 21}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 251, 21}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key}; __pyx_mstate_global->__pyx_codeobj_tab[28] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_key_flag, __pyx_k_4r_AT_1A, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[28])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 248, 69}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 5, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 254, 69}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_t, __pyx_mstate->__pyx_n_u_stock}; __pyx_mstate_global->__pyx_codeobj_tab[29] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_stock_value, __pyx_k_D_1_b_1A_b_aq_4_1CuF_fHE_8ST, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[29])) goto bad; } { - const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 254, 43}; + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 4, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 260, 43}; PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key, __pyx_mstate->__pyx_n_u_k, __pyx_mstate->__pyx_n_u_level}; __pyx_mstate_global->__pyx_codeobj_tab[30] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_tuning_level, __pyx_k_D_1_t2_AQ_5_fE_81, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[30])) goto bad; } + { + const __Pyx_PyCode_New_function_description descr = {2, 0, 0, 2, (unsigned int)(CO_OPTIMIZED|CO_NEWLOCALS), 265, 22}; + PyObject* const varnames[] = {__pyx_mstate->__pyx_n_u_self, __pyx_mstate->__pyx_n_u_key}; + __pyx_mstate_global->__pyx_codeobj_tab[31] = __Pyx_PyCode_New(descr, varnames, __pyx_mstate->__pyx_kp_u_common_params_pyx_pyx, __pyx_mstate->__pyx_n_u_get_settings_tier, __pyx_k_4r_j, tuple_dedup_map); if (unlikely(!__pyx_mstate_global->__pyx_codeobj_tab[31])) goto bad; + } Py_DECREF(tuple_dedup_map); return 0; bad: @@ -17794,6 +17972,77 @@ static CYTHON_INLINE PyObject* __Pyx_PyLong_From_int(int value) { } } +/* CIntToPy */ +static CYTHON_INLINE PyObject* __Pyx_PyLong_From_enum__ParamSettingsTier(enum ParamSettingsTier value) { +#ifdef __Pyx_HAS_GCC_DIAGNOSTIC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif + const enum ParamSettingsTier neg_one = (enum ParamSettingsTier) -1, const_zero = (enum ParamSettingsTier) 0; +#ifdef __Pyx_HAS_GCC_DIAGNOSTIC +#pragma GCC diagnostic pop +#endif + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(enum ParamSettingsTier) < sizeof(long)) { + return PyLong_FromLong((long) value); + } else if (sizeof(enum ParamSettingsTier) <= sizeof(unsigned long)) { + return PyLong_FromUnsignedLong((unsigned long) value); +#if defined(HAVE_LONG_LONG) && !CYTHON_COMPILING_IN_PYPY + } else if (sizeof(enum ParamSettingsTier) <= sizeof(unsigned PY_LONG_LONG)) { + return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value); +#endif + } + } else { + if (sizeof(enum ParamSettingsTier) <= sizeof(long)) { + return PyLong_FromLong((long) value); +#ifdef HAVE_LONG_LONG + } else if (sizeof(enum ParamSettingsTier) <= sizeof(PY_LONG_LONG)) { + return PyLong_FromLongLong((PY_LONG_LONG) value); +#endif + } + } + { + unsigned char *bytes = (unsigned char *)&value; +#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4 + if (is_unsigned) { + return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1); + } else { + return PyLong_FromNativeBytes(bytes, sizeof(value), -1); + } +#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 + int one = 1; int little = (int)*(unsigned char *)&one; + return _PyLong_FromByteArray(bytes, sizeof(enum ParamSettingsTier), + little, !is_unsigned); +#else + int one = 1; int little = (int)*(unsigned char *)&one; + PyObject *from_bytes, *result = NULL, *kwds = NULL; + PyObject *py_bytes = NULL, *order_str = NULL; + from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes"); + if (!from_bytes) return NULL; + py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(enum ParamSettingsTier)); + if (!py_bytes) goto limited_bad; + order_str = PyUnicode_FromString(little ? "little" : "big"); + if (!order_str) goto limited_bad; + { + PyObject *args[3+(CYTHON_VECTORCALL ? 1 : 0)] = { NULL, py_bytes, order_str }; + if (!is_unsigned) { + kwds = __Pyx_MakeVectorcallBuilderKwds(1); + if (!kwds) goto limited_bad; + if (__Pyx_VectorcallBuilder_AddArgStr("signed", __Pyx_NewRef(Py_True), kwds, args+3, 0) < 0) goto limited_bad; + } + result = __Pyx_Object_Vectorcall_CallFromBuilder(from_bytes, args+1, 2 | __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET, kwds); + } + limited_bad: + Py_XDECREF(kwds); + Py_XDECREF(order_str); + Py_XDECREF(py_bytes); + Py_XDECREF(from_bytes); + return result; +#endif + } +} + /* CIntToPy */ static CYTHON_INLINE PyObject* __Pyx_PyLong_From_enum__ParamKeyFlag(enum ParamKeyFlag value) { #ifdef __Pyx_HAS_GCC_DIAGNOSTIC diff --git a/common/params_pyx.so b/common/params_pyx.so index d4877fbca..5403a22e5 100755 Binary files a/common/params_pyx.so and b/common/params_pyx.so differ diff --git a/panda/board/obj/body_h7.bin.signed b/panda/board/obj/body_h7.bin.signed index 6528cba70..dbaf42c12 100644 Binary files a/panda/board/obj/body_h7.bin.signed and b/panda/board/obj/body_h7.bin.signed differ diff --git a/panda/board/obj/body_h7/bootstub.elf b/panda/board/obj/body_h7/bootstub.elf index bb28aec43..750b2285d 100755 Binary files a/panda/board/obj/body_h7/bootstub.elf and b/panda/board/obj/body_h7/bootstub.elf differ diff --git a/panda/board/obj/body_h7/main.bin b/panda/board/obj/body_h7/main.bin index 4aa692cb2..7942bef09 100755 Binary files a/panda/board/obj/body_h7/main.bin and b/panda/board/obj/body_h7/main.bin differ diff --git a/panda/board/obj/body_h7/main.elf b/panda/board/obj/body_h7/main.elf index 7e2d3165b..d0b597ec6 100755 Binary files a/panda/board/obj/body_h7/main.elf and b/panda/board/obj/body_h7/main.elf differ diff --git a/panda/board/obj/bootstub.body_h7.bin b/panda/board/obj/bootstub.body_h7.bin index 9e42e3c55..1a7ceaa37 100755 Binary files a/panda/board/obj/bootstub.body_h7.bin and b/panda/board/obj/bootstub.body_h7.bin differ diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda.bin and b/panda/board/obj/bootstub.panda.bin differ diff --git a/panda/board/obj/bootstub.panda_can_ignition_only.bin b/panda/board/obj/bootstub.panda_can_ignition_only.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_can_ignition_only.bin differ diff --git a/panda/board/obj/bootstub.panda_h7.bin b/panda/board/obj/bootstub.panda_h7.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7.bin and b/panda/board/obj/bootstub.panda_h7.bin differ diff --git a/panda/board/obj/bootstub.panda_h7_can_ignition_only.bin b/panda/board/obj/bootstub.panda_h7_can_ignition_only.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_h7_can_ignition_only.bin differ diff --git a/panda/board/obj/bootstub.panda_h7_hkg_remote.bin b/panda/board/obj/bootstub.panda_h7_hkg_remote.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7_hkg_remote.bin and b/panda/board/obj/bootstub.panda_h7_hkg_remote.bin differ diff --git a/panda/board/obj/bootstub.panda_h7_hkg_remote_can_ignition_only.bin b/panda/board/obj/bootstub.panda_h7_hkg_remote_can_ignition_only.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7_hkg_remote_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_h7_hkg_remote_can_ignition_only.bin differ diff --git a/panda/board/obj/bootstub.panda_h7_remote.bin b/panda/board/obj/bootstub.panda_h7_remote.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7_remote.bin and b/panda/board/obj/bootstub.panda_h7_remote.bin differ diff --git a/panda/board/obj/bootstub.panda_h7_remote_can_ignition_only.bin b/panda/board/obj/bootstub.panda_h7_remote_can_ignition_only.bin index 1c340b0c6..471ab3b8e 100755 Binary files a/panda/board/obj/bootstub.panda_h7_remote_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_h7_remote_can_ignition_only.bin differ diff --git a/panda/board/obj/bootstub.panda_hkg_remote.bin b/panda/board/obj/bootstub.panda_hkg_remote.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda_hkg_remote.bin and b/panda/board/obj/bootstub.panda_hkg_remote.bin differ diff --git a/panda/board/obj/bootstub.panda_hkg_remote_can_ignition_only.bin b/panda/board/obj/bootstub.panda_hkg_remote_can_ignition_only.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda_hkg_remote_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_hkg_remote_can_ignition_only.bin differ diff --git a/panda/board/obj/bootstub.panda_jungle_h7.bin b/panda/board/obj/bootstub.panda_jungle_h7.bin index 709043189..7280347e4 100755 Binary files a/panda/board/obj/bootstub.panda_jungle_h7.bin and b/panda/board/obj/bootstub.panda_jungle_h7.bin differ diff --git a/panda/board/obj/bootstub.panda_remote.bin b/panda/board/obj/bootstub.panda_remote.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda_remote.bin and b/panda/board/obj/bootstub.panda_remote.bin differ diff --git a/panda/board/obj/bootstub.panda_remote_can_ignition_only.bin b/panda/board/obj/bootstub.panda_remote_can_ignition_only.bin index 986dde12e..0f4c58d99 100755 Binary files a/panda/board/obj/bootstub.panda_remote_can_ignition_only.bin and b/panda/board/obj/bootstub.panda_remote_can_ignition_only.bin differ diff --git a/panda/board/obj/gitversion.h b/panda/board/obj/gitversion.h index b625791c6..de0e3cee6 100644 --- a/panda/board/obj/gitversion.h +++ b/panda/board/obj/gitversion.h @@ -1,2 +1,2 @@ extern const uint8_t gitversion[19]; -const uint8_t gitversion[19] = "DEV-8453f6b4-DEBUG"; +const uint8_t gitversion[19] = "DEV-a51b1fd7-DEBUG"; diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed index 925210b93..c93a4385f 100644 Binary files a/panda/board/obj/panda.bin.signed and b/panda/board/obj/panda.bin.signed differ diff --git a/panda/board/obj/panda/bootstub.elf b/panda/board/obj/panda/bootstub.elf index f4ba2720e..918e25d45 100755 Binary files a/panda/board/obj/panda/bootstub.elf and b/panda/board/obj/panda/bootstub.elf differ diff --git a/panda/board/obj/panda/main.bin b/panda/board/obj/panda/main.bin index 3c1f43ffa..a3acf659e 100755 Binary files a/panda/board/obj/panda/main.bin and b/panda/board/obj/panda/main.bin differ diff --git a/panda/board/obj/panda/main.elf b/panda/board/obj/panda/main.elf index 7401a1d8b..ea89d9f54 100755 Binary files a/panda/board/obj/panda/main.elf and b/panda/board/obj/panda/main.elf differ diff --git a/panda/board/obj/panda_can_ignition_only.bin.signed b/panda/board/obj/panda_can_ignition_only.bin.signed index 5ae692bea..c97106c4b 100644 Binary files a/panda/board/obj/panda_can_ignition_only.bin.signed and b/panda/board/obj/panda_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_can_ignition_only/bootstub.elf b/panda/board/obj/panda_can_ignition_only/bootstub.elf index deddfb994..e8052fb7c 100755 Binary files a/panda/board/obj/panda_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_can_ignition_only/main.bin b/panda/board/obj/panda_can_ignition_only/main.bin index 226f03bbd..cecf26820 100755 Binary files a/panda/board/obj/panda_can_ignition_only/main.bin and b/panda/board/obj/panda_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_can_ignition_only/main.elf b/panda/board/obj/panda_can_ignition_only/main.elf index 1591e4d09..59729401f 100755 Binary files a/panda/board/obj/panda_can_ignition_only/main.elf and b/panda/board/obj/panda_can_ignition_only/main.elf differ diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed index 24481a27a..7b094d033 100644 Binary files a/panda/board/obj/panda_h7.bin.signed and b/panda/board/obj/panda_h7.bin.signed differ diff --git a/panda/board/obj/panda_h7/bootstub.elf b/panda/board/obj/panda_h7/bootstub.elf index 77e88cdc8..6527ef818 100755 Binary files a/panda/board/obj/panda_h7/bootstub.elf and b/panda/board/obj/panda_h7/bootstub.elf differ diff --git a/panda/board/obj/panda_h7/main.bin b/panda/board/obj/panda_h7/main.bin index ca985c945..292849bb9 100755 Binary files a/panda/board/obj/panda_h7/main.bin and b/panda/board/obj/panda_h7/main.bin differ diff --git a/panda/board/obj/panda_h7/main.elf b/panda/board/obj/panda_h7/main.elf index 2c8537dac..82bbe1112 100755 Binary files a/panda/board/obj/panda_h7/main.elf and b/panda/board/obj/panda_h7/main.elf differ diff --git a/panda/board/obj/panda_h7_can_ignition_only.bin.signed b/panda/board/obj/panda_h7_can_ignition_only.bin.signed index 9f72cc1d6..4195dfb0b 100644 Binary files a/panda/board/obj/panda_h7_can_ignition_only.bin.signed and b/panda/board/obj/panda_h7_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_h7_can_ignition_only/bootstub.elf b/panda/board/obj/panda_h7_can_ignition_only/bootstub.elf index 4975f3f53..f66b8aed3 100755 Binary files a/panda/board/obj/panda_h7_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_h7_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_h7_can_ignition_only/main.bin b/panda/board/obj/panda_h7_can_ignition_only/main.bin index 77f4fe7d3..9bddcbd2d 100755 Binary files a/panda/board/obj/panda_h7_can_ignition_only/main.bin and b/panda/board/obj/panda_h7_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_h7_can_ignition_only/main.elf b/panda/board/obj/panda_h7_can_ignition_only/main.elf index 78539cef1..0aa84197a 100755 Binary files a/panda/board/obj/panda_h7_can_ignition_only/main.elf and b/panda/board/obj/panda_h7_can_ignition_only/main.elf differ diff --git a/panda/board/obj/panda_h7_hkg_remote.bin.signed b/panda/board/obj/panda_h7_hkg_remote.bin.signed index ab2f8c9d7..3f35c149c 100644 Binary files a/panda/board/obj/panda_h7_hkg_remote.bin.signed and b/panda/board/obj/panda_h7_hkg_remote.bin.signed differ diff --git a/panda/board/obj/panda_h7_hkg_remote/bootstub.elf b/panda/board/obj/panda_h7_hkg_remote/bootstub.elf index 3e97a4d06..28b4fd65b 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote/bootstub.elf and b/panda/board/obj/panda_h7_hkg_remote/bootstub.elf differ diff --git a/panda/board/obj/panda_h7_hkg_remote/main.bin b/panda/board/obj/panda_h7_hkg_remote/main.bin index 2898f3c6a..3c800f21c 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote/main.bin and b/panda/board/obj/panda_h7_hkg_remote/main.bin differ diff --git a/panda/board/obj/panda_h7_hkg_remote/main.elf b/panda/board/obj/panda_h7_hkg_remote/main.elf index e994528b4..36b4a55a9 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote/main.elf and b/panda/board/obj/panda_h7_hkg_remote/main.elf differ diff --git a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only.bin.signed b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only.bin.signed index 0dce53306..5b97caef9 100644 Binary files a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only.bin.signed and b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/bootstub.elf b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/bootstub.elf index b789f715e..413397bc5 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.bin b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.bin index 44d8c28c4..d569533c7 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.bin and b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.elf b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.elf index aa1c6e848..0079d1b79 100755 Binary files a/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.elf and b/panda/board/obj/panda_h7_hkg_remote_can_ignition_only/main.elf differ diff --git a/panda/board/obj/panda_h7_remote.bin.signed b/panda/board/obj/panda_h7_remote.bin.signed index 45dcbc6db..35352df7c 100644 Binary files a/panda/board/obj/panda_h7_remote.bin.signed and b/panda/board/obj/panda_h7_remote.bin.signed differ diff --git a/panda/board/obj/panda_h7_remote/bootstub.elf b/panda/board/obj/panda_h7_remote/bootstub.elf index dbd48b373..6b62f70c8 100755 Binary files a/panda/board/obj/panda_h7_remote/bootstub.elf and b/panda/board/obj/panda_h7_remote/bootstub.elf differ diff --git a/panda/board/obj/panda_h7_remote/main.bin b/panda/board/obj/panda_h7_remote/main.bin index b347478b3..07c1a9092 100755 Binary files a/panda/board/obj/panda_h7_remote/main.bin and b/panda/board/obj/panda_h7_remote/main.bin differ diff --git a/panda/board/obj/panda_h7_remote/main.elf b/panda/board/obj/panda_h7_remote/main.elf index b7658b81f..f730395cc 100755 Binary files a/panda/board/obj/panda_h7_remote/main.elf and b/panda/board/obj/panda_h7_remote/main.elf differ diff --git a/panda/board/obj/panda_h7_remote_can_ignition_only.bin.signed b/panda/board/obj/panda_h7_remote_can_ignition_only.bin.signed index 2df9e5f2d..1f2c79022 100644 Binary files a/panda/board/obj/panda_h7_remote_can_ignition_only.bin.signed and b/panda/board/obj/panda_h7_remote_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_h7_remote_can_ignition_only/bootstub.elf b/panda/board/obj/panda_h7_remote_can_ignition_only/bootstub.elf index b3140e767..c375d1bcd 100755 Binary files a/panda/board/obj/panda_h7_remote_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_h7_remote_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_h7_remote_can_ignition_only/main.bin b/panda/board/obj/panda_h7_remote_can_ignition_only/main.bin index d2530cdb4..2d27ae38a 100755 Binary files a/panda/board/obj/panda_h7_remote_can_ignition_only/main.bin and b/panda/board/obj/panda_h7_remote_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_h7_remote_can_ignition_only/main.elf b/panda/board/obj/panda_h7_remote_can_ignition_only/main.elf index 0e8391163..2bf614dc8 100755 Binary files a/panda/board/obj/panda_h7_remote_can_ignition_only/main.elf and b/panda/board/obj/panda_h7_remote_can_ignition_only/main.elf differ diff --git a/panda/board/obj/panda_hkg_remote.bin.signed b/panda/board/obj/panda_hkg_remote.bin.signed index 80042fac3..d6041a0a9 100644 Binary files a/panda/board/obj/panda_hkg_remote.bin.signed and b/panda/board/obj/panda_hkg_remote.bin.signed differ diff --git a/panda/board/obj/panda_hkg_remote/bootstub.elf b/panda/board/obj/panda_hkg_remote/bootstub.elf index 71449e87f..16084fcd6 100755 Binary files a/panda/board/obj/panda_hkg_remote/bootstub.elf and b/panda/board/obj/panda_hkg_remote/bootstub.elf differ diff --git a/panda/board/obj/panda_hkg_remote/main.bin b/panda/board/obj/panda_hkg_remote/main.bin index 3dd78fb00..0cd70aeaf 100755 Binary files a/panda/board/obj/panda_hkg_remote/main.bin and b/panda/board/obj/panda_hkg_remote/main.bin differ diff --git a/panda/board/obj/panda_hkg_remote/main.elf b/panda/board/obj/panda_hkg_remote/main.elf index d4bbd9f23..f9308847b 100755 Binary files a/panda/board/obj/panda_hkg_remote/main.elf and b/panda/board/obj/panda_hkg_remote/main.elf differ diff --git a/panda/board/obj/panda_hkg_remote_can_ignition_only.bin.signed b/panda/board/obj/panda_hkg_remote_can_ignition_only.bin.signed index ca616fb6d..57a692f23 100644 Binary files a/panda/board/obj/panda_hkg_remote_can_ignition_only.bin.signed and b/panda/board/obj/panda_hkg_remote_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_hkg_remote_can_ignition_only/bootstub.elf b/panda/board/obj/panda_hkg_remote_can_ignition_only/bootstub.elf index a190af0d2..1dac5ef61 100755 Binary files a/panda/board/obj/panda_hkg_remote_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_hkg_remote_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_hkg_remote_can_ignition_only/main.bin b/panda/board/obj/panda_hkg_remote_can_ignition_only/main.bin index ceb7720ee..e88b87b11 100755 Binary files a/panda/board/obj/panda_hkg_remote_can_ignition_only/main.bin and b/panda/board/obj/panda_hkg_remote_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_hkg_remote_can_ignition_only/main.elf b/panda/board/obj/panda_hkg_remote_can_ignition_only/main.elf index 50758d8ef..881fdc4d5 100755 Binary files a/panda/board/obj/panda_hkg_remote_can_ignition_only/main.elf and b/panda/board/obj/panda_hkg_remote_can_ignition_only/main.elf differ diff --git a/panda/board/obj/panda_jungle_h7.bin.signed b/panda/board/obj/panda_jungle_h7.bin.signed index 4823b269e..e5c4670ea 100644 Binary files a/panda/board/obj/panda_jungle_h7.bin.signed and b/panda/board/obj/panda_jungle_h7.bin.signed differ diff --git a/panda/board/obj/panda_jungle_h7/bootstub.elf b/panda/board/obj/panda_jungle_h7/bootstub.elf index d9105437f..a726d77ea 100755 Binary files a/panda/board/obj/panda_jungle_h7/bootstub.elf and b/panda/board/obj/panda_jungle_h7/bootstub.elf differ diff --git a/panda/board/obj/panda_jungle_h7/main.bin b/panda/board/obj/panda_jungle_h7/main.bin index 524720468..1ea2d606a 100755 Binary files a/panda/board/obj/panda_jungle_h7/main.bin and b/panda/board/obj/panda_jungle_h7/main.bin differ diff --git a/panda/board/obj/panda_jungle_h7/main.elf b/panda/board/obj/panda_jungle_h7/main.elf index cca6bc621..dcaff557e 100755 Binary files a/panda/board/obj/panda_jungle_h7/main.elf and b/panda/board/obj/panda_jungle_h7/main.elf differ diff --git a/panda/board/obj/panda_remote.bin.signed b/panda/board/obj/panda_remote.bin.signed index f093b00e7..edbfe6695 100644 Binary files a/panda/board/obj/panda_remote.bin.signed and b/panda/board/obj/panda_remote.bin.signed differ diff --git a/panda/board/obj/panda_remote/bootstub.elf b/panda/board/obj/panda_remote/bootstub.elf index 5bfea3792..0cdea7ae1 100755 Binary files a/panda/board/obj/panda_remote/bootstub.elf and b/panda/board/obj/panda_remote/bootstub.elf differ diff --git a/panda/board/obj/panda_remote/main.bin b/panda/board/obj/panda_remote/main.bin index 1e0052e8a..f268bc7ee 100755 Binary files a/panda/board/obj/panda_remote/main.bin and b/panda/board/obj/panda_remote/main.bin differ diff --git a/panda/board/obj/panda_remote/main.elf b/panda/board/obj/panda_remote/main.elf index 08340fb6b..fa4c1d8fa 100755 Binary files a/panda/board/obj/panda_remote/main.elf and b/panda/board/obj/panda_remote/main.elf differ diff --git a/panda/board/obj/panda_remote_can_ignition_only.bin.signed b/panda/board/obj/panda_remote_can_ignition_only.bin.signed index 1fd7576c4..b9e010e7f 100644 Binary files a/panda/board/obj/panda_remote_can_ignition_only.bin.signed and b/panda/board/obj/panda_remote_can_ignition_only.bin.signed differ diff --git a/panda/board/obj/panda_remote_can_ignition_only/bootstub.elf b/panda/board/obj/panda_remote_can_ignition_only/bootstub.elf index 75610dffd..c37381d78 100755 Binary files a/panda/board/obj/panda_remote_can_ignition_only/bootstub.elf and b/panda/board/obj/panda_remote_can_ignition_only/bootstub.elf differ diff --git a/panda/board/obj/panda_remote_can_ignition_only/main.bin b/panda/board/obj/panda_remote_can_ignition_only/main.bin index f0e1313de..af36a3b9b 100755 Binary files a/panda/board/obj/panda_remote_can_ignition_only/main.bin and b/panda/board/obj/panda_remote_can_ignition_only/main.bin differ diff --git a/panda/board/obj/panda_remote_can_ignition_only/main.elf b/panda/board/obj/panda_remote_can_ignition_only/main.elf index 657e59dc7..f0eeb70af 100755 Binary files a/panda/board/obj/panda_remote_can_ignition_only/main.elf and b/panda/board/obj/panda_remote_can_ignition_only/main.elf differ diff --git a/panda/board/obj/version b/panda/board/obj/version index 45e5ed2f0..c69e11f84 100644 --- a/panda/board/obj/version +++ b/panda/board/obj/version @@ -1 +1 @@ -DEV-8453f6b4-DEBUG \ No newline at end of file +DEV-a51b1fd7-DEBUG \ No newline at end of file diff --git a/selfdrive/locationd/models/generated/car.cpp b/selfdrive/locationd/models/generated/car.cpp index 956d901b1..1234969e9 100644 --- a/selfdrive/locationd/models/generated/car.cpp +++ b/selfdrive/locationd/models/generated/car.cpp @@ -45,326 +45,326 @@ const static double MAHA_THRESH_31 = 3.8414588206941227; * * * This file is part of 'ekf' * ******************************************************************************/ -void err_fun(double *nom_x, double *delta_x, double *out_8452016858633359142) { - out_8452016858633359142[0] = delta_x[0] + nom_x[0]; - out_8452016858633359142[1] = delta_x[1] + nom_x[1]; - out_8452016858633359142[2] = delta_x[2] + nom_x[2]; - out_8452016858633359142[3] = delta_x[3] + nom_x[3]; - out_8452016858633359142[4] = delta_x[4] + nom_x[4]; - out_8452016858633359142[5] = delta_x[5] + nom_x[5]; - out_8452016858633359142[6] = delta_x[6] + nom_x[6]; - out_8452016858633359142[7] = delta_x[7] + nom_x[7]; - out_8452016858633359142[8] = delta_x[8] + nom_x[8]; +void err_fun(double *nom_x, double *delta_x, double *out_6456809504724999118) { + out_6456809504724999118[0] = delta_x[0] + nom_x[0]; + out_6456809504724999118[1] = delta_x[1] + nom_x[1]; + out_6456809504724999118[2] = delta_x[2] + nom_x[2]; + out_6456809504724999118[3] = delta_x[3] + nom_x[3]; + out_6456809504724999118[4] = delta_x[4] + nom_x[4]; + out_6456809504724999118[5] = delta_x[5] + nom_x[5]; + out_6456809504724999118[6] = delta_x[6] + nom_x[6]; + out_6456809504724999118[7] = delta_x[7] + nom_x[7]; + out_6456809504724999118[8] = delta_x[8] + nom_x[8]; } -void inv_err_fun(double *nom_x, double *true_x, double *out_6091261500618765150) { - out_6091261500618765150[0] = -nom_x[0] + true_x[0]; - out_6091261500618765150[1] = -nom_x[1] + true_x[1]; - out_6091261500618765150[2] = -nom_x[2] + true_x[2]; - out_6091261500618765150[3] = -nom_x[3] + true_x[3]; - out_6091261500618765150[4] = -nom_x[4] + true_x[4]; - out_6091261500618765150[5] = -nom_x[5] + true_x[5]; - out_6091261500618765150[6] = -nom_x[6] + true_x[6]; - out_6091261500618765150[7] = -nom_x[7] + true_x[7]; - out_6091261500618765150[8] = -nom_x[8] + true_x[8]; +void inv_err_fun(double *nom_x, double *true_x, double *out_5644557425305384061) { + out_5644557425305384061[0] = -nom_x[0] + true_x[0]; + out_5644557425305384061[1] = -nom_x[1] + true_x[1]; + out_5644557425305384061[2] = -nom_x[2] + true_x[2]; + out_5644557425305384061[3] = -nom_x[3] + true_x[3]; + out_5644557425305384061[4] = -nom_x[4] + true_x[4]; + out_5644557425305384061[5] = -nom_x[5] + true_x[5]; + out_5644557425305384061[6] = -nom_x[6] + true_x[6]; + out_5644557425305384061[7] = -nom_x[7] + true_x[7]; + out_5644557425305384061[8] = -nom_x[8] + true_x[8]; } -void H_mod_fun(double *state, double *out_38657891020581010) { - out_38657891020581010[0] = 1.0; - out_38657891020581010[1] = 0.0; - out_38657891020581010[2] = 0.0; - out_38657891020581010[3] = 0.0; - out_38657891020581010[4] = 0.0; - out_38657891020581010[5] = 0.0; - out_38657891020581010[6] = 0.0; - out_38657891020581010[7] = 0.0; - out_38657891020581010[8] = 0.0; - out_38657891020581010[9] = 0.0; - out_38657891020581010[10] = 1.0; - out_38657891020581010[11] = 0.0; - out_38657891020581010[12] = 0.0; - out_38657891020581010[13] = 0.0; - out_38657891020581010[14] = 0.0; - out_38657891020581010[15] = 0.0; - out_38657891020581010[16] = 0.0; - out_38657891020581010[17] = 0.0; - out_38657891020581010[18] = 0.0; - out_38657891020581010[19] = 0.0; - out_38657891020581010[20] = 1.0; - out_38657891020581010[21] = 0.0; - out_38657891020581010[22] = 0.0; - out_38657891020581010[23] = 0.0; - out_38657891020581010[24] = 0.0; - out_38657891020581010[25] = 0.0; - out_38657891020581010[26] = 0.0; - out_38657891020581010[27] = 0.0; - out_38657891020581010[28] = 0.0; - out_38657891020581010[29] = 0.0; - out_38657891020581010[30] = 1.0; - out_38657891020581010[31] = 0.0; - out_38657891020581010[32] = 0.0; - out_38657891020581010[33] = 0.0; - out_38657891020581010[34] = 0.0; - out_38657891020581010[35] = 0.0; - out_38657891020581010[36] = 0.0; - out_38657891020581010[37] = 0.0; - out_38657891020581010[38] = 0.0; - out_38657891020581010[39] = 0.0; - out_38657891020581010[40] = 1.0; - out_38657891020581010[41] = 0.0; - out_38657891020581010[42] = 0.0; - out_38657891020581010[43] = 0.0; - out_38657891020581010[44] = 0.0; - out_38657891020581010[45] = 0.0; - out_38657891020581010[46] = 0.0; - out_38657891020581010[47] = 0.0; - out_38657891020581010[48] = 0.0; - out_38657891020581010[49] = 0.0; - out_38657891020581010[50] = 1.0; - out_38657891020581010[51] = 0.0; - out_38657891020581010[52] = 0.0; - out_38657891020581010[53] = 0.0; - out_38657891020581010[54] = 0.0; - out_38657891020581010[55] = 0.0; - out_38657891020581010[56] = 0.0; - out_38657891020581010[57] = 0.0; - out_38657891020581010[58] = 0.0; - out_38657891020581010[59] = 0.0; - out_38657891020581010[60] = 1.0; - out_38657891020581010[61] = 0.0; - out_38657891020581010[62] = 0.0; - out_38657891020581010[63] = 0.0; - out_38657891020581010[64] = 0.0; - out_38657891020581010[65] = 0.0; - out_38657891020581010[66] = 0.0; - out_38657891020581010[67] = 0.0; - out_38657891020581010[68] = 0.0; - out_38657891020581010[69] = 0.0; - out_38657891020581010[70] = 1.0; - out_38657891020581010[71] = 0.0; - out_38657891020581010[72] = 0.0; - out_38657891020581010[73] = 0.0; - out_38657891020581010[74] = 0.0; - out_38657891020581010[75] = 0.0; - out_38657891020581010[76] = 0.0; - out_38657891020581010[77] = 0.0; - out_38657891020581010[78] = 0.0; - out_38657891020581010[79] = 0.0; - out_38657891020581010[80] = 1.0; +void H_mod_fun(double *state, double *out_3623313066644464969) { + out_3623313066644464969[0] = 1.0; + out_3623313066644464969[1] = 0.0; + out_3623313066644464969[2] = 0.0; + out_3623313066644464969[3] = 0.0; + out_3623313066644464969[4] = 0.0; + out_3623313066644464969[5] = 0.0; + out_3623313066644464969[6] = 0.0; + out_3623313066644464969[7] = 0.0; + out_3623313066644464969[8] = 0.0; + out_3623313066644464969[9] = 0.0; + out_3623313066644464969[10] = 1.0; + out_3623313066644464969[11] = 0.0; + out_3623313066644464969[12] = 0.0; + out_3623313066644464969[13] = 0.0; + out_3623313066644464969[14] = 0.0; + out_3623313066644464969[15] = 0.0; + out_3623313066644464969[16] = 0.0; + out_3623313066644464969[17] = 0.0; + out_3623313066644464969[18] = 0.0; + out_3623313066644464969[19] = 0.0; + out_3623313066644464969[20] = 1.0; + out_3623313066644464969[21] = 0.0; + out_3623313066644464969[22] = 0.0; + out_3623313066644464969[23] = 0.0; + out_3623313066644464969[24] = 0.0; + out_3623313066644464969[25] = 0.0; + out_3623313066644464969[26] = 0.0; + out_3623313066644464969[27] = 0.0; + out_3623313066644464969[28] = 0.0; + out_3623313066644464969[29] = 0.0; + out_3623313066644464969[30] = 1.0; + out_3623313066644464969[31] = 0.0; + out_3623313066644464969[32] = 0.0; + out_3623313066644464969[33] = 0.0; + out_3623313066644464969[34] = 0.0; + out_3623313066644464969[35] = 0.0; + out_3623313066644464969[36] = 0.0; + out_3623313066644464969[37] = 0.0; + out_3623313066644464969[38] = 0.0; + out_3623313066644464969[39] = 0.0; + out_3623313066644464969[40] = 1.0; + out_3623313066644464969[41] = 0.0; + out_3623313066644464969[42] = 0.0; + out_3623313066644464969[43] = 0.0; + out_3623313066644464969[44] = 0.0; + out_3623313066644464969[45] = 0.0; + out_3623313066644464969[46] = 0.0; + out_3623313066644464969[47] = 0.0; + out_3623313066644464969[48] = 0.0; + out_3623313066644464969[49] = 0.0; + out_3623313066644464969[50] = 1.0; + out_3623313066644464969[51] = 0.0; + out_3623313066644464969[52] = 0.0; + out_3623313066644464969[53] = 0.0; + out_3623313066644464969[54] = 0.0; + out_3623313066644464969[55] = 0.0; + out_3623313066644464969[56] = 0.0; + out_3623313066644464969[57] = 0.0; + out_3623313066644464969[58] = 0.0; + out_3623313066644464969[59] = 0.0; + out_3623313066644464969[60] = 1.0; + out_3623313066644464969[61] = 0.0; + out_3623313066644464969[62] = 0.0; + out_3623313066644464969[63] = 0.0; + out_3623313066644464969[64] = 0.0; + out_3623313066644464969[65] = 0.0; + out_3623313066644464969[66] = 0.0; + out_3623313066644464969[67] = 0.0; + out_3623313066644464969[68] = 0.0; + out_3623313066644464969[69] = 0.0; + out_3623313066644464969[70] = 1.0; + out_3623313066644464969[71] = 0.0; + out_3623313066644464969[72] = 0.0; + out_3623313066644464969[73] = 0.0; + out_3623313066644464969[74] = 0.0; + out_3623313066644464969[75] = 0.0; + out_3623313066644464969[76] = 0.0; + out_3623313066644464969[77] = 0.0; + out_3623313066644464969[78] = 0.0; + out_3623313066644464969[79] = 0.0; + out_3623313066644464969[80] = 1.0; } -void f_fun(double *state, double dt, double *out_558885094687163216) { - out_558885094687163216[0] = state[0]; - out_558885094687163216[1] = state[1]; - out_558885094687163216[2] = state[2]; - out_558885094687163216[3] = state[3]; - out_558885094687163216[4] = state[4]; - out_558885094687163216[5] = dt*((-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]))*state[6] - 9.8100000000000005*state[8] + stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*state[1]) + (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*state[4])) + state[5]; - out_558885094687163216[6] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*state[4])) + state[6]; - out_558885094687163216[7] = state[7]; - out_558885094687163216[8] = state[8]; +void f_fun(double *state, double dt, double *out_2530420459597428980) { + out_2530420459597428980[0] = state[0]; + out_2530420459597428980[1] = state[1]; + out_2530420459597428980[2] = state[2]; + out_2530420459597428980[3] = state[3]; + out_2530420459597428980[4] = state[4]; + out_2530420459597428980[5] = dt*((-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4]))*state[6] - 9.8100000000000005*state[8] + stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*state[1]) + (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*state[4])) + state[5]; + out_2530420459597428980[6] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*state[4])) + state[6]; + out_2530420459597428980[7] = state[7]; + out_2530420459597428980[8] = state[8]; } -void F_fun(double *state, double dt, double *out_2583716049044893862) { - out_2583716049044893862[0] = 1; - out_2583716049044893862[1] = 0; - out_2583716049044893862[2] = 0; - out_2583716049044893862[3] = 0; - out_2583716049044893862[4] = 0; - out_2583716049044893862[5] = 0; - out_2583716049044893862[6] = 0; - out_2583716049044893862[7] = 0; - out_2583716049044893862[8] = 0; - out_2583716049044893862[9] = 0; - out_2583716049044893862[10] = 1; - out_2583716049044893862[11] = 0; - out_2583716049044893862[12] = 0; - out_2583716049044893862[13] = 0; - out_2583716049044893862[14] = 0; - out_2583716049044893862[15] = 0; - out_2583716049044893862[16] = 0; - out_2583716049044893862[17] = 0; - out_2583716049044893862[18] = 0; - out_2583716049044893862[19] = 0; - out_2583716049044893862[20] = 1; - out_2583716049044893862[21] = 0; - out_2583716049044893862[22] = 0; - out_2583716049044893862[23] = 0; - out_2583716049044893862[24] = 0; - out_2583716049044893862[25] = 0; - out_2583716049044893862[26] = 0; - out_2583716049044893862[27] = 0; - out_2583716049044893862[28] = 0; - out_2583716049044893862[29] = 0; - out_2583716049044893862[30] = 1; - out_2583716049044893862[31] = 0; - out_2583716049044893862[32] = 0; - out_2583716049044893862[33] = 0; - out_2583716049044893862[34] = 0; - out_2583716049044893862[35] = 0; - out_2583716049044893862[36] = 0; - out_2583716049044893862[37] = 0; - out_2583716049044893862[38] = 0; - out_2583716049044893862[39] = 0; - out_2583716049044893862[40] = 1; - out_2583716049044893862[41] = 0; - out_2583716049044893862[42] = 0; - out_2583716049044893862[43] = 0; - out_2583716049044893862[44] = 0; - out_2583716049044893862[45] = dt*(stiffness_front*(-state[2] - state[3] + state[7])/(mass*state[1]) + (-stiffness_front - stiffness_rear)*state[5]/(mass*state[4]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[6]/(mass*state[4])); - out_2583716049044893862[46] = -dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*pow(state[1], 2)); - out_2583716049044893862[47] = -dt*stiffness_front*state[0]/(mass*state[1]); - out_2583716049044893862[48] = -dt*stiffness_front*state[0]/(mass*state[1]); - out_2583716049044893862[49] = dt*((-1 - (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*pow(state[4], 2)))*state[6] - (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*pow(state[4], 2))); - out_2583716049044893862[50] = dt*(-stiffness_front*state[0] - stiffness_rear*state[0])/(mass*state[4]) + 1; - out_2583716049044893862[51] = dt*(-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4])); - out_2583716049044893862[52] = dt*stiffness_front*state[0]/(mass*state[1]); - out_2583716049044893862[53] = -9.8100000000000005*dt; - out_2583716049044893862[54] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front - pow(center_to_rear, 2)*stiffness_rear)*state[6]/(rotational_inertia*state[4])); - out_2583716049044893862[55] = -center_to_front*dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*pow(state[1], 2)); - out_2583716049044893862[56] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); - out_2583716049044893862[57] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); - out_2583716049044893862[58] = dt*(-(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*pow(state[4], 2)) - (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*pow(state[4], 2))); - out_2583716049044893862[59] = dt*(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(rotational_inertia*state[4]); - out_2583716049044893862[60] = dt*(-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])/(rotational_inertia*state[4]) + 1; - out_2583716049044893862[61] = center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); - out_2583716049044893862[62] = 0; - out_2583716049044893862[63] = 0; - out_2583716049044893862[64] = 0; - out_2583716049044893862[65] = 0; - out_2583716049044893862[66] = 0; - out_2583716049044893862[67] = 0; - out_2583716049044893862[68] = 0; - out_2583716049044893862[69] = 0; - out_2583716049044893862[70] = 1; - out_2583716049044893862[71] = 0; - out_2583716049044893862[72] = 0; - out_2583716049044893862[73] = 0; - out_2583716049044893862[74] = 0; - out_2583716049044893862[75] = 0; - out_2583716049044893862[76] = 0; - out_2583716049044893862[77] = 0; - out_2583716049044893862[78] = 0; - out_2583716049044893862[79] = 0; - out_2583716049044893862[80] = 1; +void F_fun(double *state, double dt, double *out_7641637713499099284) { + out_7641637713499099284[0] = 1; + out_7641637713499099284[1] = 0; + out_7641637713499099284[2] = 0; + out_7641637713499099284[3] = 0; + out_7641637713499099284[4] = 0; + out_7641637713499099284[5] = 0; + out_7641637713499099284[6] = 0; + out_7641637713499099284[7] = 0; + out_7641637713499099284[8] = 0; + out_7641637713499099284[9] = 0; + out_7641637713499099284[10] = 1; + out_7641637713499099284[11] = 0; + out_7641637713499099284[12] = 0; + out_7641637713499099284[13] = 0; + out_7641637713499099284[14] = 0; + out_7641637713499099284[15] = 0; + out_7641637713499099284[16] = 0; + out_7641637713499099284[17] = 0; + out_7641637713499099284[18] = 0; + out_7641637713499099284[19] = 0; + out_7641637713499099284[20] = 1; + out_7641637713499099284[21] = 0; + out_7641637713499099284[22] = 0; + out_7641637713499099284[23] = 0; + out_7641637713499099284[24] = 0; + out_7641637713499099284[25] = 0; + out_7641637713499099284[26] = 0; + out_7641637713499099284[27] = 0; + out_7641637713499099284[28] = 0; + out_7641637713499099284[29] = 0; + out_7641637713499099284[30] = 1; + out_7641637713499099284[31] = 0; + out_7641637713499099284[32] = 0; + out_7641637713499099284[33] = 0; + out_7641637713499099284[34] = 0; + out_7641637713499099284[35] = 0; + out_7641637713499099284[36] = 0; + out_7641637713499099284[37] = 0; + out_7641637713499099284[38] = 0; + out_7641637713499099284[39] = 0; + out_7641637713499099284[40] = 1; + out_7641637713499099284[41] = 0; + out_7641637713499099284[42] = 0; + out_7641637713499099284[43] = 0; + out_7641637713499099284[44] = 0; + out_7641637713499099284[45] = dt*(stiffness_front*(-state[2] - state[3] + state[7])/(mass*state[1]) + (-stiffness_front - stiffness_rear)*state[5]/(mass*state[4]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[6]/(mass*state[4])); + out_7641637713499099284[46] = -dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(mass*pow(state[1], 2)); + out_7641637713499099284[47] = -dt*stiffness_front*state[0]/(mass*state[1]); + out_7641637713499099284[48] = -dt*stiffness_front*state[0]/(mass*state[1]); + out_7641637713499099284[49] = dt*((-1 - (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*pow(state[4], 2)))*state[6] - (-stiffness_front*state[0] - stiffness_rear*state[0])*state[5]/(mass*pow(state[4], 2))); + out_7641637713499099284[50] = dt*(-stiffness_front*state[0] - stiffness_rear*state[0])/(mass*state[4]) + 1; + out_7641637713499099284[51] = dt*(-state[4] + (-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(mass*state[4])); + out_7641637713499099284[52] = dt*stiffness_front*state[0]/(mass*state[1]); + out_7641637713499099284[53] = -9.8100000000000005*dt; + out_7641637713499099284[54] = dt*(center_to_front*stiffness_front*(-state[2] - state[3] + state[7])/(rotational_inertia*state[1]) + (-center_to_front*stiffness_front + center_to_rear*stiffness_rear)*state[5]/(rotational_inertia*state[4]) + (-pow(center_to_front, 2)*stiffness_front - pow(center_to_rear, 2)*stiffness_rear)*state[6]/(rotational_inertia*state[4])); + out_7641637713499099284[55] = -center_to_front*dt*stiffness_front*(-state[2] - state[3] + state[7])*state[0]/(rotational_inertia*pow(state[1], 2)); + out_7641637713499099284[56] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); + out_7641637713499099284[57] = -center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); + out_7641637713499099284[58] = dt*(-(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])*state[5]/(rotational_inertia*pow(state[4], 2)) - (-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])*state[6]/(rotational_inertia*pow(state[4], 2))); + out_7641637713499099284[59] = dt*(-center_to_front*stiffness_front*state[0] + center_to_rear*stiffness_rear*state[0])/(rotational_inertia*state[4]); + out_7641637713499099284[60] = dt*(-pow(center_to_front, 2)*stiffness_front*state[0] - pow(center_to_rear, 2)*stiffness_rear*state[0])/(rotational_inertia*state[4]) + 1; + out_7641637713499099284[61] = center_to_front*dt*stiffness_front*state[0]/(rotational_inertia*state[1]); + out_7641637713499099284[62] = 0; + out_7641637713499099284[63] = 0; + out_7641637713499099284[64] = 0; + out_7641637713499099284[65] = 0; + out_7641637713499099284[66] = 0; + out_7641637713499099284[67] = 0; + out_7641637713499099284[68] = 0; + out_7641637713499099284[69] = 0; + out_7641637713499099284[70] = 1; + out_7641637713499099284[71] = 0; + out_7641637713499099284[72] = 0; + out_7641637713499099284[73] = 0; + out_7641637713499099284[74] = 0; + out_7641637713499099284[75] = 0; + out_7641637713499099284[76] = 0; + out_7641637713499099284[77] = 0; + out_7641637713499099284[78] = 0; + out_7641637713499099284[79] = 0; + out_7641637713499099284[80] = 1; } -void h_25(double *state, double *unused, double *out_6863161802963304328) { - out_6863161802963304328[0] = state[6]; +void h_25(double *state, double *unused, double *out_9149101986531247315) { + out_9149101986531247315[0] = state[6]; } -void H_25(double *state, double *unused, double *out_2872687221825540538) { - out_2872687221825540538[0] = 0; - out_2872687221825540538[1] = 0; - out_2872687221825540538[2] = 0; - out_2872687221825540538[3] = 0; - out_2872687221825540538[4] = 0; - out_2872687221825540538[5] = 0; - out_2872687221825540538[6] = 1; - out_2872687221825540538[7] = 0; - out_2872687221825540538[8] = 0; +void H_25(double *state, double *unused, double *out_8527004891829129809) { + out_8527004891829129809[0] = 0; + out_8527004891829129809[1] = 0; + out_8527004891829129809[2] = 0; + out_8527004891829129809[3] = 0; + out_8527004891829129809[4] = 0; + out_8527004891829129809[5] = 0; + out_8527004891829129809[6] = 1; + out_8527004891829129809[7] = 0; + out_8527004891829129809[8] = 0; } -void h_24(double *state, double *unused, double *out_1110917950379322687) { - out_1110917950379322687[0] = state[4]; - out_1110917950379322687[1] = state[5]; +void h_24(double *state, double *unused, double *out_3166828984508355697) { + out_3166828984508355697[0] = state[4]; + out_3166828984508355697[1] = state[5]; } -void H_24(double *state, double *unused, double *out_4545704411851386355) { - out_4545704411851386355[0] = 0; - out_4545704411851386355[1] = 0; - out_4545704411851386355[2] = 0; - out_4545704411851386355[3] = 0; - out_4545704411851386355[4] = 1; - out_4545704411851386355[5] = 0; - out_4545704411851386355[6] = 0; - out_4545704411851386355[7] = 0; - out_4545704411851386355[8] = 0; - out_4545704411851386355[9] = 0; - out_4545704411851386355[10] = 0; - out_4545704411851386355[11] = 0; - out_4545704411851386355[12] = 0; - out_4545704411851386355[13] = 0; - out_4545704411851386355[14] = 1; - out_4545704411851386355[15] = 0; - out_4545704411851386355[16] = 0; - out_4545704411851386355[17] = 0; +void H_24(double *state, double *unused, double *out_2072385171006399745) { + out_2072385171006399745[0] = 0; + out_2072385171006399745[1] = 0; + out_2072385171006399745[2] = 0; + out_2072385171006399745[3] = 0; + out_2072385171006399745[4] = 1; + out_2072385171006399745[5] = 0; + out_2072385171006399745[6] = 0; + out_2072385171006399745[7] = 0; + out_2072385171006399745[8] = 0; + out_2072385171006399745[9] = 0; + out_2072385171006399745[10] = 0; + out_2072385171006399745[11] = 0; + out_2072385171006399745[12] = 0; + out_2072385171006399745[13] = 0; + out_2072385171006399745[14] = 1; + out_2072385171006399745[15] = 0; + out_2072385171006399745[16] = 0; + out_2072385171006399745[17] = 0; } -void h_30(double *state, double *unused, double *out_3820317013925574847) { - out_3820317013925574847[0] = state[4]; +void h_30(double *state, double *unused, double *out_1385836729710574874) { + out_1385836729710574874[0] = state[4]; } -void H_30(double *state, double *unused, double *out_7400383551953148736) { - out_7400383551953148736[0] = 0; - out_7400383551953148736[1] = 0; - out_7400383551953148736[2] = 0; - out_7400383551953148736[3] = 0; - out_7400383551953148736[4] = 1; - out_7400383551953148736[5] = 0; - out_7400383551953148736[6] = 0; - out_7400383551953148736[7] = 0; - out_7400383551953148736[8] = 0; +void H_30(double *state, double *unused, double *out_7401406223373173180) { + out_7401406223373173180[0] = 0; + out_7401406223373173180[1] = 0; + out_7401406223373173180[2] = 0; + out_7401406223373173180[3] = 0; + out_7401406223373173180[4] = 1; + out_7401406223373173180[5] = 0; + out_7401406223373173180[6] = 0; + out_7401406223373173180[7] = 0; + out_7401406223373173180[8] = 0; } -void h_26(double *state, double *unused, double *out_3983562419870100788) { - out_3983562419870100788[0] = state[7]; +void h_26(double *state, double *unused, double *out_7332000190158117452) { + out_7332000190158117452[0] = state[7]; } -void H_26(double *state, double *unused, double *out_6614190540699596762) { - out_6614190540699596762[0] = 0; - out_6614190540699596762[1] = 0; - out_6614190540699596762[2] = 0; - out_6614190540699596762[3] = 0; - out_6614190540699596762[4] = 0; - out_6614190540699596762[5] = 0; - out_6614190540699596762[6] = 0; - out_6614190540699596762[7] = 1; - out_6614190540699596762[8] = 0; +void H_26(double *state, double *unused, double *out_4785501572955073585) { + out_4785501572955073585[0] = 0; + out_4785501572955073585[1] = 0; + out_4785501572955073585[2] = 0; + out_4785501572955073585[3] = 0; + out_4785501572955073585[4] = 0; + out_4785501572955073585[5] = 0; + out_4785501572955073585[6] = 0; + out_4785501572955073585[7] = 1; + out_4785501572955073585[8] = 0; } -void h_27(double *state, double *unused, double *out_70918829331572549) { - out_70918829331572549[0] = state[3]; +void h_27(double *state, double *unused, double *out_3419356599619589213) { + out_3419356599619589213[0] = state[3]; } -void H_27(double *state, double *unused, double *out_5176789480769205519) { - out_5176789480769205519[0] = 0; - out_5176789480769205519[1] = 0; - out_5176789480769205519[2] = 0; - out_5176789480769205519[3] = 1; - out_5176789480769205519[4] = 0; - out_5176789480769205519[5] = 0; - out_5176789480769205519[6] = 0; - out_5176789480769205519[7] = 0; - out_5176789480769205519[8] = 0; +void H_27(double *state, double *unused, double *out_8870574538535953525) { + out_8870574538535953525[0] = 0; + out_8870574538535953525[1] = 0; + out_8870574538535953525[2] = 0; + out_8870574538535953525[3] = 1; + out_8870574538535953525[4] = 0; + out_8870574538535953525[5] = 0; + out_8870574538535953525[6] = 0; + out_8870574538535953525[7] = 0; + out_8870574538535953525[8] = 0; } -void h_29(double *state, double *unused, double *out_4423632898602052364) { - out_4423632898602052364[0] = state[1]; +void h_29(double *state, double *unused, double *out_442326876808912439) { + out_442326876808912439[0] = state[1]; } -void H_29(double *state, double *unused, double *out_6890152207638756552) { - out_6890152207638756552[0] = 0; - out_6890152207638756552[1] = 1; - out_6890152207638756552[2] = 0; - out_6890152207638756552[3] = 0; - out_6890152207638756552[4] = 0; - out_6890152207638756552[5] = 0; - out_6890152207638756552[6] = 0; - out_6890152207638756552[7] = 0; - out_6890152207638756552[8] = 0; +void H_29(double *state, double *unused, double *out_6891174879058780996) { + out_6891174879058780996[0] = 0; + out_6891174879058780996[1] = 1; + out_6891174879058780996[2] = 0; + out_6891174879058780996[3] = 0; + out_6891174879058780996[4] = 0; + out_6891174879058780996[5] = 0; + out_6891174879058780996[6] = 0; + out_6891174879058780996[7] = 0; + out_6891174879058780996[8] = 0; } -void h_28(double *state, double *unused, double *out_3204928983415884040) { - out_3204928983415884040[0] = state[0]; +void h_28(double *state, double *unused, double *out_6231908702889442596) { + out_6231908702889442596[0] = state[0]; } -void H_28(double *state, double *unused, double *out_4926521936073430301) { - out_4926521936073430301[0] = 1; - out_4926521936073430301[1] = 0; - out_4926521936073430301[2] = 0; - out_4926521936073430301[3] = 0; - out_4926521936073430301[4] = 0; - out_4926521936073430301[5] = 0; - out_4926521936073430301[6] = 0; - out_4926521936073430301[7] = 0; - out_4926521936073430301[8] = 0; +void H_28(double *state, double *unused, double *out_6473170177581240046) { + out_6473170177581240046[0] = 1; + out_6473170177581240046[1] = 0; + out_6473170177581240046[2] = 0; + out_6473170177581240046[3] = 0; + out_6473170177581240046[4] = 0; + out_6473170177581240046[5] = 0; + out_6473170177581240046[6] = 0; + out_6473170177581240046[7] = 0; + out_6473170177581240046[8] = 0; } -void h_31(double *state, double *unused, double *out_597396961285583997) { - out_597396961285583997[0] = state[8]; +void h_31(double *state, double *unused, double *out_657764610459762417) { + out_657764610459762417[0] = state[8]; } -void H_31(double *state, double *unused, double *out_2842041259948580110) { - out_2842041259948580110[0] = 0; - out_2842041259948580110[1] = 0; - out_2842041259948580110[2] = 0; - out_2842041259948580110[3] = 0; - out_2842041259948580110[4] = 0; - out_2842041259948580110[5] = 0; - out_2842041259948580110[6] = 0; - out_2842041259948580110[7] = 0; - out_2842041259948580110[8] = 1; +void H_31(double *state, double *unused, double *out_4159293470721722109) { + out_4159293470721722109[0] = 0; + out_4159293470721722109[1] = 0; + out_4159293470721722109[2] = 0; + out_4159293470721722109[3] = 0; + out_4159293470721722109[4] = 0; + out_4159293470721722109[5] = 0; + out_4159293470721722109[6] = 0; + out_4159293470721722109[7] = 0; + out_4159293470721722109[8] = 1; } #include #include @@ -518,68 +518,68 @@ void car_update_28(double *in_x, double *in_P, double *in_z, double *in_R, doubl void car_update_31(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) { update<1, 3, 0>(in_x, in_P, h_31, H_31, NULL, in_z, in_R, in_ea, MAHA_THRESH_31); } -void car_err_fun(double *nom_x, double *delta_x, double *out_8452016858633359142) { - err_fun(nom_x, delta_x, out_8452016858633359142); +void car_err_fun(double *nom_x, double *delta_x, double *out_6456809504724999118) { + err_fun(nom_x, delta_x, out_6456809504724999118); } -void car_inv_err_fun(double *nom_x, double *true_x, double *out_6091261500618765150) { - inv_err_fun(nom_x, true_x, out_6091261500618765150); +void car_inv_err_fun(double *nom_x, double *true_x, double *out_5644557425305384061) { + inv_err_fun(nom_x, true_x, out_5644557425305384061); } -void car_H_mod_fun(double *state, double *out_38657891020581010) { - H_mod_fun(state, out_38657891020581010); +void car_H_mod_fun(double *state, double *out_3623313066644464969) { + H_mod_fun(state, out_3623313066644464969); } -void car_f_fun(double *state, double dt, double *out_558885094687163216) { - f_fun(state, dt, out_558885094687163216); +void car_f_fun(double *state, double dt, double *out_2530420459597428980) { + f_fun(state, dt, out_2530420459597428980); } -void car_F_fun(double *state, double dt, double *out_2583716049044893862) { - F_fun(state, dt, out_2583716049044893862); +void car_F_fun(double *state, double dt, double *out_7641637713499099284) { + F_fun(state, dt, out_7641637713499099284); } -void car_h_25(double *state, double *unused, double *out_6863161802963304328) { - h_25(state, unused, out_6863161802963304328); +void car_h_25(double *state, double *unused, double *out_9149101986531247315) { + h_25(state, unused, out_9149101986531247315); } -void car_H_25(double *state, double *unused, double *out_2872687221825540538) { - H_25(state, unused, out_2872687221825540538); +void car_H_25(double *state, double *unused, double *out_8527004891829129809) { + H_25(state, unused, out_8527004891829129809); } -void car_h_24(double *state, double *unused, double *out_1110917950379322687) { - h_24(state, unused, out_1110917950379322687); +void car_h_24(double *state, double *unused, double *out_3166828984508355697) { + h_24(state, unused, out_3166828984508355697); } -void car_H_24(double *state, double *unused, double *out_4545704411851386355) { - H_24(state, unused, out_4545704411851386355); +void car_H_24(double *state, double *unused, double *out_2072385171006399745) { + H_24(state, unused, out_2072385171006399745); } -void car_h_30(double *state, double *unused, double *out_3820317013925574847) { - h_30(state, unused, out_3820317013925574847); +void car_h_30(double *state, double *unused, double *out_1385836729710574874) { + h_30(state, unused, out_1385836729710574874); } -void car_H_30(double *state, double *unused, double *out_7400383551953148736) { - H_30(state, unused, out_7400383551953148736); +void car_H_30(double *state, double *unused, double *out_7401406223373173180) { + H_30(state, unused, out_7401406223373173180); } -void car_h_26(double *state, double *unused, double *out_3983562419870100788) { - h_26(state, unused, out_3983562419870100788); +void car_h_26(double *state, double *unused, double *out_7332000190158117452) { + h_26(state, unused, out_7332000190158117452); } -void car_H_26(double *state, double *unused, double *out_6614190540699596762) { - H_26(state, unused, out_6614190540699596762); +void car_H_26(double *state, double *unused, double *out_4785501572955073585) { + H_26(state, unused, out_4785501572955073585); } -void car_h_27(double *state, double *unused, double *out_70918829331572549) { - h_27(state, unused, out_70918829331572549); +void car_h_27(double *state, double *unused, double *out_3419356599619589213) { + h_27(state, unused, out_3419356599619589213); } -void car_H_27(double *state, double *unused, double *out_5176789480769205519) { - H_27(state, unused, out_5176789480769205519); +void car_H_27(double *state, double *unused, double *out_8870574538535953525) { + H_27(state, unused, out_8870574538535953525); } -void car_h_29(double *state, double *unused, double *out_4423632898602052364) { - h_29(state, unused, out_4423632898602052364); +void car_h_29(double *state, double *unused, double *out_442326876808912439) { + h_29(state, unused, out_442326876808912439); } -void car_H_29(double *state, double *unused, double *out_6890152207638756552) { - H_29(state, unused, out_6890152207638756552); +void car_H_29(double *state, double *unused, double *out_6891174879058780996) { + H_29(state, unused, out_6891174879058780996); } -void car_h_28(double *state, double *unused, double *out_3204928983415884040) { - h_28(state, unused, out_3204928983415884040); +void car_h_28(double *state, double *unused, double *out_6231908702889442596) { + h_28(state, unused, out_6231908702889442596); } -void car_H_28(double *state, double *unused, double *out_4926521936073430301) { - H_28(state, unused, out_4926521936073430301); +void car_H_28(double *state, double *unused, double *out_6473170177581240046) { + H_28(state, unused, out_6473170177581240046); } -void car_h_31(double *state, double *unused, double *out_597396961285583997) { - h_31(state, unused, out_597396961285583997); +void car_h_31(double *state, double *unused, double *out_657764610459762417) { + h_31(state, unused, out_657764610459762417); } -void car_H_31(double *state, double *unused, double *out_2842041259948580110) { - H_31(state, unused, out_2842041259948580110); +void car_H_31(double *state, double *unused, double *out_4159293470721722109) { + H_31(state, unused, out_4159293470721722109); } void car_predict(double *in_x, double *in_P, double *in_Q, double dt) { predict(in_x, in_P, in_Q, dt); diff --git a/selfdrive/locationd/models/generated/car.h b/selfdrive/locationd/models/generated/car.h index f463224fe..a68e33a1a 100644 --- a/selfdrive/locationd/models/generated/car.h +++ b/selfdrive/locationd/models/generated/car.h @@ -9,27 +9,27 @@ void car_update_27(double *in_x, double *in_P, double *in_z, double *in_R, doubl void car_update_29(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); void car_update_28(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); void car_update_31(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); -void car_err_fun(double *nom_x, double *delta_x, double *out_8452016858633359142); -void car_inv_err_fun(double *nom_x, double *true_x, double *out_6091261500618765150); -void car_H_mod_fun(double *state, double *out_38657891020581010); -void car_f_fun(double *state, double dt, double *out_558885094687163216); -void car_F_fun(double *state, double dt, double *out_2583716049044893862); -void car_h_25(double *state, double *unused, double *out_6863161802963304328); -void car_H_25(double *state, double *unused, double *out_2872687221825540538); -void car_h_24(double *state, double *unused, double *out_1110917950379322687); -void car_H_24(double *state, double *unused, double *out_4545704411851386355); -void car_h_30(double *state, double *unused, double *out_3820317013925574847); -void car_H_30(double *state, double *unused, double *out_7400383551953148736); -void car_h_26(double *state, double *unused, double *out_3983562419870100788); -void car_H_26(double *state, double *unused, double *out_6614190540699596762); -void car_h_27(double *state, double *unused, double *out_70918829331572549); -void car_H_27(double *state, double *unused, double *out_5176789480769205519); -void car_h_29(double *state, double *unused, double *out_4423632898602052364); -void car_H_29(double *state, double *unused, double *out_6890152207638756552); -void car_h_28(double *state, double *unused, double *out_3204928983415884040); -void car_H_28(double *state, double *unused, double *out_4926521936073430301); -void car_h_31(double *state, double *unused, double *out_597396961285583997); -void car_H_31(double *state, double *unused, double *out_2842041259948580110); +void car_err_fun(double *nom_x, double *delta_x, double *out_6456809504724999118); +void car_inv_err_fun(double *nom_x, double *true_x, double *out_5644557425305384061); +void car_H_mod_fun(double *state, double *out_3623313066644464969); +void car_f_fun(double *state, double dt, double *out_2530420459597428980); +void car_F_fun(double *state, double dt, double *out_7641637713499099284); +void car_h_25(double *state, double *unused, double *out_9149101986531247315); +void car_H_25(double *state, double *unused, double *out_8527004891829129809); +void car_h_24(double *state, double *unused, double *out_3166828984508355697); +void car_H_24(double *state, double *unused, double *out_2072385171006399745); +void car_h_30(double *state, double *unused, double *out_1385836729710574874); +void car_H_30(double *state, double *unused, double *out_7401406223373173180); +void car_h_26(double *state, double *unused, double *out_7332000190158117452); +void car_H_26(double *state, double *unused, double *out_4785501572955073585); +void car_h_27(double *state, double *unused, double *out_3419356599619589213); +void car_H_27(double *state, double *unused, double *out_8870574538535953525); +void car_h_29(double *state, double *unused, double *out_442326876808912439); +void car_H_29(double *state, double *unused, double *out_6891174879058780996); +void car_h_28(double *state, double *unused, double *out_6231908702889442596); +void car_H_28(double *state, double *unused, double *out_6473170177581240046); +void car_h_31(double *state, double *unused, double *out_657764610459762417); +void car_H_31(double *state, double *unused, double *out_4159293470721722109); void car_predict(double *in_x, double *in_P, double *in_Q, double dt); void car_set_mass(double x); void car_set_rotational_inertia(double x); diff --git a/selfdrive/locationd/models/generated/pose.cpp b/selfdrive/locationd/models/generated/pose.cpp index 86d71c43f..d4cfe453b 100644 --- a/selfdrive/locationd/models/generated/pose.cpp +++ b/selfdrive/locationd/models/generated/pose.cpp @@ -17,961 +17,961 @@ const static double MAHA_THRESH_14 = 7.814727903251177; * * * This file is part of 'ekf' * ******************************************************************************/ -void err_fun(double *nom_x, double *delta_x, double *out_3585092682791090136) { - out_3585092682791090136[0] = delta_x[0] + nom_x[0]; - out_3585092682791090136[1] = delta_x[1] + nom_x[1]; - out_3585092682791090136[2] = delta_x[2] + nom_x[2]; - out_3585092682791090136[3] = delta_x[3] + nom_x[3]; - out_3585092682791090136[4] = delta_x[4] + nom_x[4]; - out_3585092682791090136[5] = delta_x[5] + nom_x[5]; - out_3585092682791090136[6] = delta_x[6] + nom_x[6]; - out_3585092682791090136[7] = delta_x[7] + nom_x[7]; - out_3585092682791090136[8] = delta_x[8] + nom_x[8]; - out_3585092682791090136[9] = delta_x[9] + nom_x[9]; - out_3585092682791090136[10] = delta_x[10] + nom_x[10]; - out_3585092682791090136[11] = delta_x[11] + nom_x[11]; - out_3585092682791090136[12] = delta_x[12] + nom_x[12]; - out_3585092682791090136[13] = delta_x[13] + nom_x[13]; - out_3585092682791090136[14] = delta_x[14] + nom_x[14]; - out_3585092682791090136[15] = delta_x[15] + nom_x[15]; - out_3585092682791090136[16] = delta_x[16] + nom_x[16]; - out_3585092682791090136[17] = delta_x[17] + nom_x[17]; +void err_fun(double *nom_x, double *delta_x, double *out_8879515811318903877) { + out_8879515811318903877[0] = delta_x[0] + nom_x[0]; + out_8879515811318903877[1] = delta_x[1] + nom_x[1]; + out_8879515811318903877[2] = delta_x[2] + nom_x[2]; + out_8879515811318903877[3] = delta_x[3] + nom_x[3]; + out_8879515811318903877[4] = delta_x[4] + nom_x[4]; + out_8879515811318903877[5] = delta_x[5] + nom_x[5]; + out_8879515811318903877[6] = delta_x[6] + nom_x[6]; + out_8879515811318903877[7] = delta_x[7] + nom_x[7]; + out_8879515811318903877[8] = delta_x[8] + nom_x[8]; + out_8879515811318903877[9] = delta_x[9] + nom_x[9]; + out_8879515811318903877[10] = delta_x[10] + nom_x[10]; + out_8879515811318903877[11] = delta_x[11] + nom_x[11]; + out_8879515811318903877[12] = delta_x[12] + nom_x[12]; + out_8879515811318903877[13] = delta_x[13] + nom_x[13]; + out_8879515811318903877[14] = delta_x[14] + nom_x[14]; + out_8879515811318903877[15] = delta_x[15] + nom_x[15]; + out_8879515811318903877[16] = delta_x[16] + nom_x[16]; + out_8879515811318903877[17] = delta_x[17] + nom_x[17]; } -void inv_err_fun(double *nom_x, double *true_x, double *out_3602092163882833613) { - out_3602092163882833613[0] = -nom_x[0] + true_x[0]; - out_3602092163882833613[1] = -nom_x[1] + true_x[1]; - out_3602092163882833613[2] = -nom_x[2] + true_x[2]; - out_3602092163882833613[3] = -nom_x[3] + true_x[3]; - out_3602092163882833613[4] = -nom_x[4] + true_x[4]; - out_3602092163882833613[5] = -nom_x[5] + true_x[5]; - out_3602092163882833613[6] = -nom_x[6] + true_x[6]; - out_3602092163882833613[7] = -nom_x[7] + true_x[7]; - out_3602092163882833613[8] = -nom_x[8] + true_x[8]; - out_3602092163882833613[9] = -nom_x[9] + true_x[9]; - out_3602092163882833613[10] = -nom_x[10] + true_x[10]; - out_3602092163882833613[11] = -nom_x[11] + true_x[11]; - out_3602092163882833613[12] = -nom_x[12] + true_x[12]; - out_3602092163882833613[13] = -nom_x[13] + true_x[13]; - out_3602092163882833613[14] = -nom_x[14] + true_x[14]; - out_3602092163882833613[15] = -nom_x[15] + true_x[15]; - out_3602092163882833613[16] = -nom_x[16] + true_x[16]; - out_3602092163882833613[17] = -nom_x[17] + true_x[17]; +void inv_err_fun(double *nom_x, double *true_x, double *out_5299248816140732451) { + out_5299248816140732451[0] = -nom_x[0] + true_x[0]; + out_5299248816140732451[1] = -nom_x[1] + true_x[1]; + out_5299248816140732451[2] = -nom_x[2] + true_x[2]; + out_5299248816140732451[3] = -nom_x[3] + true_x[3]; + out_5299248816140732451[4] = -nom_x[4] + true_x[4]; + out_5299248816140732451[5] = -nom_x[5] + true_x[5]; + out_5299248816140732451[6] = -nom_x[6] + true_x[6]; + out_5299248816140732451[7] = -nom_x[7] + true_x[7]; + out_5299248816140732451[8] = -nom_x[8] + true_x[8]; + out_5299248816140732451[9] = -nom_x[9] + true_x[9]; + out_5299248816140732451[10] = -nom_x[10] + true_x[10]; + out_5299248816140732451[11] = -nom_x[11] + true_x[11]; + out_5299248816140732451[12] = -nom_x[12] + true_x[12]; + out_5299248816140732451[13] = -nom_x[13] + true_x[13]; + out_5299248816140732451[14] = -nom_x[14] + true_x[14]; + out_5299248816140732451[15] = -nom_x[15] + true_x[15]; + out_5299248816140732451[16] = -nom_x[16] + true_x[16]; + out_5299248816140732451[17] = -nom_x[17] + true_x[17]; } -void H_mod_fun(double *state, double *out_9072779523166268742) { - out_9072779523166268742[0] = 1.0; - out_9072779523166268742[1] = 0.0; - out_9072779523166268742[2] = 0.0; - out_9072779523166268742[3] = 0.0; - out_9072779523166268742[4] = 0.0; - out_9072779523166268742[5] = 0.0; - out_9072779523166268742[6] = 0.0; - out_9072779523166268742[7] = 0.0; - out_9072779523166268742[8] = 0.0; - out_9072779523166268742[9] = 0.0; - out_9072779523166268742[10] = 0.0; - out_9072779523166268742[11] = 0.0; - out_9072779523166268742[12] = 0.0; - out_9072779523166268742[13] = 0.0; - out_9072779523166268742[14] = 0.0; - out_9072779523166268742[15] = 0.0; - out_9072779523166268742[16] = 0.0; - out_9072779523166268742[17] = 0.0; - out_9072779523166268742[18] = 0.0; - out_9072779523166268742[19] = 1.0; - out_9072779523166268742[20] = 0.0; - out_9072779523166268742[21] = 0.0; - out_9072779523166268742[22] = 0.0; - out_9072779523166268742[23] = 0.0; - out_9072779523166268742[24] = 0.0; - out_9072779523166268742[25] = 0.0; - out_9072779523166268742[26] = 0.0; - out_9072779523166268742[27] = 0.0; - out_9072779523166268742[28] = 0.0; - out_9072779523166268742[29] = 0.0; - out_9072779523166268742[30] = 0.0; - out_9072779523166268742[31] = 0.0; - out_9072779523166268742[32] = 0.0; - out_9072779523166268742[33] = 0.0; - out_9072779523166268742[34] = 0.0; - out_9072779523166268742[35] = 0.0; - out_9072779523166268742[36] = 0.0; - out_9072779523166268742[37] = 0.0; - out_9072779523166268742[38] = 1.0; - out_9072779523166268742[39] = 0.0; - out_9072779523166268742[40] = 0.0; - out_9072779523166268742[41] = 0.0; - out_9072779523166268742[42] = 0.0; - out_9072779523166268742[43] = 0.0; - out_9072779523166268742[44] = 0.0; - out_9072779523166268742[45] = 0.0; - out_9072779523166268742[46] = 0.0; - out_9072779523166268742[47] = 0.0; - out_9072779523166268742[48] = 0.0; - out_9072779523166268742[49] = 0.0; - out_9072779523166268742[50] = 0.0; - out_9072779523166268742[51] = 0.0; - out_9072779523166268742[52] = 0.0; - out_9072779523166268742[53] = 0.0; - out_9072779523166268742[54] = 0.0; - out_9072779523166268742[55] = 0.0; - out_9072779523166268742[56] = 0.0; - out_9072779523166268742[57] = 1.0; - out_9072779523166268742[58] = 0.0; - out_9072779523166268742[59] = 0.0; - out_9072779523166268742[60] = 0.0; - out_9072779523166268742[61] = 0.0; - out_9072779523166268742[62] = 0.0; - out_9072779523166268742[63] = 0.0; - out_9072779523166268742[64] = 0.0; - out_9072779523166268742[65] = 0.0; - out_9072779523166268742[66] = 0.0; - out_9072779523166268742[67] = 0.0; - out_9072779523166268742[68] = 0.0; - out_9072779523166268742[69] = 0.0; - out_9072779523166268742[70] = 0.0; - out_9072779523166268742[71] = 0.0; - out_9072779523166268742[72] = 0.0; - out_9072779523166268742[73] = 0.0; - out_9072779523166268742[74] = 0.0; - out_9072779523166268742[75] = 0.0; - out_9072779523166268742[76] = 1.0; - out_9072779523166268742[77] = 0.0; - out_9072779523166268742[78] = 0.0; - out_9072779523166268742[79] = 0.0; - out_9072779523166268742[80] = 0.0; - out_9072779523166268742[81] = 0.0; - out_9072779523166268742[82] = 0.0; - out_9072779523166268742[83] = 0.0; - out_9072779523166268742[84] = 0.0; - out_9072779523166268742[85] = 0.0; - out_9072779523166268742[86] = 0.0; - out_9072779523166268742[87] = 0.0; - out_9072779523166268742[88] = 0.0; - out_9072779523166268742[89] = 0.0; - out_9072779523166268742[90] = 0.0; - out_9072779523166268742[91] = 0.0; - out_9072779523166268742[92] = 0.0; - out_9072779523166268742[93] = 0.0; - out_9072779523166268742[94] = 0.0; - out_9072779523166268742[95] = 1.0; - out_9072779523166268742[96] = 0.0; - out_9072779523166268742[97] = 0.0; - out_9072779523166268742[98] = 0.0; - out_9072779523166268742[99] = 0.0; - out_9072779523166268742[100] = 0.0; - out_9072779523166268742[101] = 0.0; - out_9072779523166268742[102] = 0.0; - out_9072779523166268742[103] = 0.0; - out_9072779523166268742[104] = 0.0; - out_9072779523166268742[105] = 0.0; - out_9072779523166268742[106] = 0.0; - out_9072779523166268742[107] = 0.0; - out_9072779523166268742[108] = 0.0; - out_9072779523166268742[109] = 0.0; - out_9072779523166268742[110] = 0.0; - out_9072779523166268742[111] = 0.0; - out_9072779523166268742[112] = 0.0; - out_9072779523166268742[113] = 0.0; - out_9072779523166268742[114] = 1.0; - out_9072779523166268742[115] = 0.0; - out_9072779523166268742[116] = 0.0; - out_9072779523166268742[117] = 0.0; - out_9072779523166268742[118] = 0.0; - out_9072779523166268742[119] = 0.0; - out_9072779523166268742[120] = 0.0; - out_9072779523166268742[121] = 0.0; - out_9072779523166268742[122] = 0.0; - out_9072779523166268742[123] = 0.0; - out_9072779523166268742[124] = 0.0; - out_9072779523166268742[125] = 0.0; - out_9072779523166268742[126] = 0.0; - out_9072779523166268742[127] = 0.0; - out_9072779523166268742[128] = 0.0; - out_9072779523166268742[129] = 0.0; - out_9072779523166268742[130] = 0.0; - out_9072779523166268742[131] = 0.0; - out_9072779523166268742[132] = 0.0; - out_9072779523166268742[133] = 1.0; - out_9072779523166268742[134] = 0.0; - out_9072779523166268742[135] = 0.0; - out_9072779523166268742[136] = 0.0; - out_9072779523166268742[137] = 0.0; - out_9072779523166268742[138] = 0.0; - out_9072779523166268742[139] = 0.0; - out_9072779523166268742[140] = 0.0; - out_9072779523166268742[141] = 0.0; - out_9072779523166268742[142] = 0.0; - out_9072779523166268742[143] = 0.0; - out_9072779523166268742[144] = 0.0; - out_9072779523166268742[145] = 0.0; - out_9072779523166268742[146] = 0.0; - out_9072779523166268742[147] = 0.0; - out_9072779523166268742[148] = 0.0; - out_9072779523166268742[149] = 0.0; - out_9072779523166268742[150] = 0.0; - out_9072779523166268742[151] = 0.0; - out_9072779523166268742[152] = 1.0; - out_9072779523166268742[153] = 0.0; - out_9072779523166268742[154] = 0.0; - out_9072779523166268742[155] = 0.0; - out_9072779523166268742[156] = 0.0; - out_9072779523166268742[157] = 0.0; - out_9072779523166268742[158] = 0.0; - out_9072779523166268742[159] = 0.0; - out_9072779523166268742[160] = 0.0; - out_9072779523166268742[161] = 0.0; - out_9072779523166268742[162] = 0.0; - out_9072779523166268742[163] = 0.0; - out_9072779523166268742[164] = 0.0; - out_9072779523166268742[165] = 0.0; - out_9072779523166268742[166] = 0.0; - out_9072779523166268742[167] = 0.0; - out_9072779523166268742[168] = 0.0; - out_9072779523166268742[169] = 0.0; - out_9072779523166268742[170] = 0.0; - out_9072779523166268742[171] = 1.0; - out_9072779523166268742[172] = 0.0; - out_9072779523166268742[173] = 0.0; - out_9072779523166268742[174] = 0.0; - out_9072779523166268742[175] = 0.0; - out_9072779523166268742[176] = 0.0; - out_9072779523166268742[177] = 0.0; - out_9072779523166268742[178] = 0.0; - out_9072779523166268742[179] = 0.0; - out_9072779523166268742[180] = 0.0; - out_9072779523166268742[181] = 0.0; - out_9072779523166268742[182] = 0.0; - out_9072779523166268742[183] = 0.0; - out_9072779523166268742[184] = 0.0; - out_9072779523166268742[185] = 0.0; - out_9072779523166268742[186] = 0.0; - out_9072779523166268742[187] = 0.0; - out_9072779523166268742[188] = 0.0; - out_9072779523166268742[189] = 0.0; - out_9072779523166268742[190] = 1.0; - out_9072779523166268742[191] = 0.0; - out_9072779523166268742[192] = 0.0; - out_9072779523166268742[193] = 0.0; - out_9072779523166268742[194] = 0.0; - out_9072779523166268742[195] = 0.0; - out_9072779523166268742[196] = 0.0; - out_9072779523166268742[197] = 0.0; - out_9072779523166268742[198] = 0.0; - out_9072779523166268742[199] = 0.0; - out_9072779523166268742[200] = 0.0; - out_9072779523166268742[201] = 0.0; - out_9072779523166268742[202] = 0.0; - out_9072779523166268742[203] = 0.0; - out_9072779523166268742[204] = 0.0; - out_9072779523166268742[205] = 0.0; - out_9072779523166268742[206] = 0.0; - out_9072779523166268742[207] = 0.0; - out_9072779523166268742[208] = 0.0; - out_9072779523166268742[209] = 1.0; - out_9072779523166268742[210] = 0.0; - out_9072779523166268742[211] = 0.0; - out_9072779523166268742[212] = 0.0; - out_9072779523166268742[213] = 0.0; - out_9072779523166268742[214] = 0.0; - out_9072779523166268742[215] = 0.0; - out_9072779523166268742[216] = 0.0; - out_9072779523166268742[217] = 0.0; - out_9072779523166268742[218] = 0.0; - out_9072779523166268742[219] = 0.0; - out_9072779523166268742[220] = 0.0; - out_9072779523166268742[221] = 0.0; - out_9072779523166268742[222] = 0.0; - out_9072779523166268742[223] = 0.0; - out_9072779523166268742[224] = 0.0; - out_9072779523166268742[225] = 0.0; - out_9072779523166268742[226] = 0.0; - out_9072779523166268742[227] = 0.0; - out_9072779523166268742[228] = 1.0; - out_9072779523166268742[229] = 0.0; - out_9072779523166268742[230] = 0.0; - out_9072779523166268742[231] = 0.0; - out_9072779523166268742[232] = 0.0; - out_9072779523166268742[233] = 0.0; - out_9072779523166268742[234] = 0.0; - out_9072779523166268742[235] = 0.0; - out_9072779523166268742[236] = 0.0; - out_9072779523166268742[237] = 0.0; - out_9072779523166268742[238] = 0.0; - out_9072779523166268742[239] = 0.0; - out_9072779523166268742[240] = 0.0; - out_9072779523166268742[241] = 0.0; - out_9072779523166268742[242] = 0.0; - out_9072779523166268742[243] = 0.0; - out_9072779523166268742[244] = 0.0; - out_9072779523166268742[245] = 0.0; - out_9072779523166268742[246] = 0.0; - out_9072779523166268742[247] = 1.0; - out_9072779523166268742[248] = 0.0; - out_9072779523166268742[249] = 0.0; - out_9072779523166268742[250] = 0.0; - out_9072779523166268742[251] = 0.0; - out_9072779523166268742[252] = 0.0; - out_9072779523166268742[253] = 0.0; - out_9072779523166268742[254] = 0.0; - out_9072779523166268742[255] = 0.0; - out_9072779523166268742[256] = 0.0; - out_9072779523166268742[257] = 0.0; - out_9072779523166268742[258] = 0.0; - out_9072779523166268742[259] = 0.0; - out_9072779523166268742[260] = 0.0; - out_9072779523166268742[261] = 0.0; - out_9072779523166268742[262] = 0.0; - out_9072779523166268742[263] = 0.0; - out_9072779523166268742[264] = 0.0; - out_9072779523166268742[265] = 0.0; - out_9072779523166268742[266] = 1.0; - out_9072779523166268742[267] = 0.0; - out_9072779523166268742[268] = 0.0; - out_9072779523166268742[269] = 0.0; - out_9072779523166268742[270] = 0.0; - out_9072779523166268742[271] = 0.0; - out_9072779523166268742[272] = 0.0; - out_9072779523166268742[273] = 0.0; - out_9072779523166268742[274] = 0.0; - out_9072779523166268742[275] = 0.0; - out_9072779523166268742[276] = 0.0; - out_9072779523166268742[277] = 0.0; - out_9072779523166268742[278] = 0.0; - out_9072779523166268742[279] = 0.0; - out_9072779523166268742[280] = 0.0; - out_9072779523166268742[281] = 0.0; - out_9072779523166268742[282] = 0.0; - out_9072779523166268742[283] = 0.0; - out_9072779523166268742[284] = 0.0; - out_9072779523166268742[285] = 1.0; - out_9072779523166268742[286] = 0.0; - out_9072779523166268742[287] = 0.0; - out_9072779523166268742[288] = 0.0; - out_9072779523166268742[289] = 0.0; - out_9072779523166268742[290] = 0.0; - out_9072779523166268742[291] = 0.0; - out_9072779523166268742[292] = 0.0; - out_9072779523166268742[293] = 0.0; - out_9072779523166268742[294] = 0.0; - out_9072779523166268742[295] = 0.0; - out_9072779523166268742[296] = 0.0; - out_9072779523166268742[297] = 0.0; - out_9072779523166268742[298] = 0.0; - out_9072779523166268742[299] = 0.0; - out_9072779523166268742[300] = 0.0; - out_9072779523166268742[301] = 0.0; - out_9072779523166268742[302] = 0.0; - out_9072779523166268742[303] = 0.0; - out_9072779523166268742[304] = 1.0; - out_9072779523166268742[305] = 0.0; - out_9072779523166268742[306] = 0.0; - out_9072779523166268742[307] = 0.0; - out_9072779523166268742[308] = 0.0; - out_9072779523166268742[309] = 0.0; - out_9072779523166268742[310] = 0.0; - out_9072779523166268742[311] = 0.0; - out_9072779523166268742[312] = 0.0; - out_9072779523166268742[313] = 0.0; - out_9072779523166268742[314] = 0.0; - out_9072779523166268742[315] = 0.0; - out_9072779523166268742[316] = 0.0; - out_9072779523166268742[317] = 0.0; - out_9072779523166268742[318] = 0.0; - out_9072779523166268742[319] = 0.0; - out_9072779523166268742[320] = 0.0; - out_9072779523166268742[321] = 0.0; - out_9072779523166268742[322] = 0.0; - out_9072779523166268742[323] = 1.0; +void H_mod_fun(double *state, double *out_4677544152144015683) { + out_4677544152144015683[0] = 1.0; + out_4677544152144015683[1] = 0.0; + out_4677544152144015683[2] = 0.0; + out_4677544152144015683[3] = 0.0; + out_4677544152144015683[4] = 0.0; + out_4677544152144015683[5] = 0.0; + out_4677544152144015683[6] = 0.0; + out_4677544152144015683[7] = 0.0; + out_4677544152144015683[8] = 0.0; + out_4677544152144015683[9] = 0.0; + out_4677544152144015683[10] = 0.0; + out_4677544152144015683[11] = 0.0; + out_4677544152144015683[12] = 0.0; + out_4677544152144015683[13] = 0.0; + out_4677544152144015683[14] = 0.0; + out_4677544152144015683[15] = 0.0; + out_4677544152144015683[16] = 0.0; + out_4677544152144015683[17] = 0.0; + out_4677544152144015683[18] = 0.0; + out_4677544152144015683[19] = 1.0; + out_4677544152144015683[20] = 0.0; + out_4677544152144015683[21] = 0.0; + out_4677544152144015683[22] = 0.0; + out_4677544152144015683[23] = 0.0; + out_4677544152144015683[24] = 0.0; + out_4677544152144015683[25] = 0.0; + out_4677544152144015683[26] = 0.0; + out_4677544152144015683[27] = 0.0; + out_4677544152144015683[28] = 0.0; + out_4677544152144015683[29] = 0.0; + out_4677544152144015683[30] = 0.0; + out_4677544152144015683[31] = 0.0; + out_4677544152144015683[32] = 0.0; + out_4677544152144015683[33] = 0.0; + out_4677544152144015683[34] = 0.0; + out_4677544152144015683[35] = 0.0; + out_4677544152144015683[36] = 0.0; + out_4677544152144015683[37] = 0.0; + out_4677544152144015683[38] = 1.0; + out_4677544152144015683[39] = 0.0; + out_4677544152144015683[40] = 0.0; + out_4677544152144015683[41] = 0.0; + out_4677544152144015683[42] = 0.0; + out_4677544152144015683[43] = 0.0; + out_4677544152144015683[44] = 0.0; + out_4677544152144015683[45] = 0.0; + out_4677544152144015683[46] = 0.0; + out_4677544152144015683[47] = 0.0; + out_4677544152144015683[48] = 0.0; + out_4677544152144015683[49] = 0.0; + out_4677544152144015683[50] = 0.0; + out_4677544152144015683[51] = 0.0; + out_4677544152144015683[52] = 0.0; + out_4677544152144015683[53] = 0.0; + out_4677544152144015683[54] = 0.0; + out_4677544152144015683[55] = 0.0; + out_4677544152144015683[56] = 0.0; + out_4677544152144015683[57] = 1.0; + out_4677544152144015683[58] = 0.0; + out_4677544152144015683[59] = 0.0; + out_4677544152144015683[60] = 0.0; + out_4677544152144015683[61] = 0.0; + out_4677544152144015683[62] = 0.0; + out_4677544152144015683[63] = 0.0; + out_4677544152144015683[64] = 0.0; + out_4677544152144015683[65] = 0.0; + out_4677544152144015683[66] = 0.0; + out_4677544152144015683[67] = 0.0; + out_4677544152144015683[68] = 0.0; + out_4677544152144015683[69] = 0.0; + out_4677544152144015683[70] = 0.0; + out_4677544152144015683[71] = 0.0; + out_4677544152144015683[72] = 0.0; + out_4677544152144015683[73] = 0.0; + out_4677544152144015683[74] = 0.0; + out_4677544152144015683[75] = 0.0; + out_4677544152144015683[76] = 1.0; + out_4677544152144015683[77] = 0.0; + out_4677544152144015683[78] = 0.0; + out_4677544152144015683[79] = 0.0; + out_4677544152144015683[80] = 0.0; + out_4677544152144015683[81] = 0.0; + out_4677544152144015683[82] = 0.0; + out_4677544152144015683[83] = 0.0; + out_4677544152144015683[84] = 0.0; + out_4677544152144015683[85] = 0.0; + out_4677544152144015683[86] = 0.0; + out_4677544152144015683[87] = 0.0; + out_4677544152144015683[88] = 0.0; + out_4677544152144015683[89] = 0.0; + out_4677544152144015683[90] = 0.0; + out_4677544152144015683[91] = 0.0; + out_4677544152144015683[92] = 0.0; + out_4677544152144015683[93] = 0.0; + out_4677544152144015683[94] = 0.0; + out_4677544152144015683[95] = 1.0; + out_4677544152144015683[96] = 0.0; + out_4677544152144015683[97] = 0.0; + out_4677544152144015683[98] = 0.0; + out_4677544152144015683[99] = 0.0; + out_4677544152144015683[100] = 0.0; + out_4677544152144015683[101] = 0.0; + out_4677544152144015683[102] = 0.0; + out_4677544152144015683[103] = 0.0; + out_4677544152144015683[104] = 0.0; + out_4677544152144015683[105] = 0.0; + out_4677544152144015683[106] = 0.0; + out_4677544152144015683[107] = 0.0; + out_4677544152144015683[108] = 0.0; + out_4677544152144015683[109] = 0.0; + out_4677544152144015683[110] = 0.0; + out_4677544152144015683[111] = 0.0; + out_4677544152144015683[112] = 0.0; + out_4677544152144015683[113] = 0.0; + out_4677544152144015683[114] = 1.0; + out_4677544152144015683[115] = 0.0; + out_4677544152144015683[116] = 0.0; + out_4677544152144015683[117] = 0.0; + out_4677544152144015683[118] = 0.0; + out_4677544152144015683[119] = 0.0; + out_4677544152144015683[120] = 0.0; + out_4677544152144015683[121] = 0.0; + out_4677544152144015683[122] = 0.0; + out_4677544152144015683[123] = 0.0; + out_4677544152144015683[124] = 0.0; + out_4677544152144015683[125] = 0.0; + out_4677544152144015683[126] = 0.0; + out_4677544152144015683[127] = 0.0; + out_4677544152144015683[128] = 0.0; + out_4677544152144015683[129] = 0.0; + out_4677544152144015683[130] = 0.0; + out_4677544152144015683[131] = 0.0; + out_4677544152144015683[132] = 0.0; + out_4677544152144015683[133] = 1.0; + out_4677544152144015683[134] = 0.0; + out_4677544152144015683[135] = 0.0; + out_4677544152144015683[136] = 0.0; + out_4677544152144015683[137] = 0.0; + out_4677544152144015683[138] = 0.0; + out_4677544152144015683[139] = 0.0; + out_4677544152144015683[140] = 0.0; + out_4677544152144015683[141] = 0.0; + out_4677544152144015683[142] = 0.0; + out_4677544152144015683[143] = 0.0; + out_4677544152144015683[144] = 0.0; + out_4677544152144015683[145] = 0.0; + out_4677544152144015683[146] = 0.0; + out_4677544152144015683[147] = 0.0; + out_4677544152144015683[148] = 0.0; + out_4677544152144015683[149] = 0.0; + out_4677544152144015683[150] = 0.0; + out_4677544152144015683[151] = 0.0; + out_4677544152144015683[152] = 1.0; + out_4677544152144015683[153] = 0.0; + out_4677544152144015683[154] = 0.0; + out_4677544152144015683[155] = 0.0; + out_4677544152144015683[156] = 0.0; + out_4677544152144015683[157] = 0.0; + out_4677544152144015683[158] = 0.0; + out_4677544152144015683[159] = 0.0; + out_4677544152144015683[160] = 0.0; + out_4677544152144015683[161] = 0.0; + out_4677544152144015683[162] = 0.0; + out_4677544152144015683[163] = 0.0; + out_4677544152144015683[164] = 0.0; + out_4677544152144015683[165] = 0.0; + out_4677544152144015683[166] = 0.0; + out_4677544152144015683[167] = 0.0; + out_4677544152144015683[168] = 0.0; + out_4677544152144015683[169] = 0.0; + out_4677544152144015683[170] = 0.0; + out_4677544152144015683[171] = 1.0; + out_4677544152144015683[172] = 0.0; + out_4677544152144015683[173] = 0.0; + out_4677544152144015683[174] = 0.0; + out_4677544152144015683[175] = 0.0; + out_4677544152144015683[176] = 0.0; + out_4677544152144015683[177] = 0.0; + out_4677544152144015683[178] = 0.0; + out_4677544152144015683[179] = 0.0; + out_4677544152144015683[180] = 0.0; + out_4677544152144015683[181] = 0.0; + out_4677544152144015683[182] = 0.0; + out_4677544152144015683[183] = 0.0; + out_4677544152144015683[184] = 0.0; + out_4677544152144015683[185] = 0.0; + out_4677544152144015683[186] = 0.0; + out_4677544152144015683[187] = 0.0; + out_4677544152144015683[188] = 0.0; + out_4677544152144015683[189] = 0.0; + out_4677544152144015683[190] = 1.0; + out_4677544152144015683[191] = 0.0; + out_4677544152144015683[192] = 0.0; + out_4677544152144015683[193] = 0.0; + out_4677544152144015683[194] = 0.0; + out_4677544152144015683[195] = 0.0; + out_4677544152144015683[196] = 0.0; + out_4677544152144015683[197] = 0.0; + out_4677544152144015683[198] = 0.0; + out_4677544152144015683[199] = 0.0; + out_4677544152144015683[200] = 0.0; + out_4677544152144015683[201] = 0.0; + out_4677544152144015683[202] = 0.0; + out_4677544152144015683[203] = 0.0; + out_4677544152144015683[204] = 0.0; + out_4677544152144015683[205] = 0.0; + out_4677544152144015683[206] = 0.0; + out_4677544152144015683[207] = 0.0; + out_4677544152144015683[208] = 0.0; + out_4677544152144015683[209] = 1.0; + out_4677544152144015683[210] = 0.0; + out_4677544152144015683[211] = 0.0; + out_4677544152144015683[212] = 0.0; + out_4677544152144015683[213] = 0.0; + out_4677544152144015683[214] = 0.0; + out_4677544152144015683[215] = 0.0; + out_4677544152144015683[216] = 0.0; + out_4677544152144015683[217] = 0.0; + out_4677544152144015683[218] = 0.0; + out_4677544152144015683[219] = 0.0; + out_4677544152144015683[220] = 0.0; + out_4677544152144015683[221] = 0.0; + out_4677544152144015683[222] = 0.0; + out_4677544152144015683[223] = 0.0; + out_4677544152144015683[224] = 0.0; + out_4677544152144015683[225] = 0.0; + out_4677544152144015683[226] = 0.0; + out_4677544152144015683[227] = 0.0; + out_4677544152144015683[228] = 1.0; + out_4677544152144015683[229] = 0.0; + out_4677544152144015683[230] = 0.0; + out_4677544152144015683[231] = 0.0; + out_4677544152144015683[232] = 0.0; + out_4677544152144015683[233] = 0.0; + out_4677544152144015683[234] = 0.0; + out_4677544152144015683[235] = 0.0; + out_4677544152144015683[236] = 0.0; + out_4677544152144015683[237] = 0.0; + out_4677544152144015683[238] = 0.0; + out_4677544152144015683[239] = 0.0; + out_4677544152144015683[240] = 0.0; + out_4677544152144015683[241] = 0.0; + out_4677544152144015683[242] = 0.0; + out_4677544152144015683[243] = 0.0; + out_4677544152144015683[244] = 0.0; + out_4677544152144015683[245] = 0.0; + out_4677544152144015683[246] = 0.0; + out_4677544152144015683[247] = 1.0; + out_4677544152144015683[248] = 0.0; + out_4677544152144015683[249] = 0.0; + out_4677544152144015683[250] = 0.0; + out_4677544152144015683[251] = 0.0; + out_4677544152144015683[252] = 0.0; + out_4677544152144015683[253] = 0.0; + out_4677544152144015683[254] = 0.0; + out_4677544152144015683[255] = 0.0; + out_4677544152144015683[256] = 0.0; + out_4677544152144015683[257] = 0.0; + out_4677544152144015683[258] = 0.0; + out_4677544152144015683[259] = 0.0; + out_4677544152144015683[260] = 0.0; + out_4677544152144015683[261] = 0.0; + out_4677544152144015683[262] = 0.0; + out_4677544152144015683[263] = 0.0; + out_4677544152144015683[264] = 0.0; + out_4677544152144015683[265] = 0.0; + out_4677544152144015683[266] = 1.0; + out_4677544152144015683[267] = 0.0; + out_4677544152144015683[268] = 0.0; + out_4677544152144015683[269] = 0.0; + out_4677544152144015683[270] = 0.0; + out_4677544152144015683[271] = 0.0; + out_4677544152144015683[272] = 0.0; + out_4677544152144015683[273] = 0.0; + out_4677544152144015683[274] = 0.0; + out_4677544152144015683[275] = 0.0; + out_4677544152144015683[276] = 0.0; + out_4677544152144015683[277] = 0.0; + out_4677544152144015683[278] = 0.0; + out_4677544152144015683[279] = 0.0; + out_4677544152144015683[280] = 0.0; + out_4677544152144015683[281] = 0.0; + out_4677544152144015683[282] = 0.0; + out_4677544152144015683[283] = 0.0; + out_4677544152144015683[284] = 0.0; + out_4677544152144015683[285] = 1.0; + out_4677544152144015683[286] = 0.0; + out_4677544152144015683[287] = 0.0; + out_4677544152144015683[288] = 0.0; + out_4677544152144015683[289] = 0.0; + out_4677544152144015683[290] = 0.0; + out_4677544152144015683[291] = 0.0; + out_4677544152144015683[292] = 0.0; + out_4677544152144015683[293] = 0.0; + out_4677544152144015683[294] = 0.0; + out_4677544152144015683[295] = 0.0; + out_4677544152144015683[296] = 0.0; + out_4677544152144015683[297] = 0.0; + out_4677544152144015683[298] = 0.0; + out_4677544152144015683[299] = 0.0; + out_4677544152144015683[300] = 0.0; + out_4677544152144015683[301] = 0.0; + out_4677544152144015683[302] = 0.0; + out_4677544152144015683[303] = 0.0; + out_4677544152144015683[304] = 1.0; + out_4677544152144015683[305] = 0.0; + out_4677544152144015683[306] = 0.0; + out_4677544152144015683[307] = 0.0; + out_4677544152144015683[308] = 0.0; + out_4677544152144015683[309] = 0.0; + out_4677544152144015683[310] = 0.0; + out_4677544152144015683[311] = 0.0; + out_4677544152144015683[312] = 0.0; + out_4677544152144015683[313] = 0.0; + out_4677544152144015683[314] = 0.0; + out_4677544152144015683[315] = 0.0; + out_4677544152144015683[316] = 0.0; + out_4677544152144015683[317] = 0.0; + out_4677544152144015683[318] = 0.0; + out_4677544152144015683[319] = 0.0; + out_4677544152144015683[320] = 0.0; + out_4677544152144015683[321] = 0.0; + out_4677544152144015683[322] = 0.0; + out_4677544152144015683[323] = 1.0; } -void f_fun(double *state, double dt, double *out_8675559756142309217) { - out_8675559756142309217[0] = atan2((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), -(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1])); - out_8675559756142309217[1] = asin(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8])); - out_8675559756142309217[2] = atan2(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), -(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2])); - out_8675559756142309217[3] = dt*state[12] + state[3]; - out_8675559756142309217[4] = dt*state[13] + state[4]; - out_8675559756142309217[5] = dt*state[14] + state[5]; - out_8675559756142309217[6] = state[6]; - out_8675559756142309217[7] = state[7]; - out_8675559756142309217[8] = state[8]; - out_8675559756142309217[9] = state[9]; - out_8675559756142309217[10] = state[10]; - out_8675559756142309217[11] = state[11]; - out_8675559756142309217[12] = state[12]; - out_8675559756142309217[13] = state[13]; - out_8675559756142309217[14] = state[14]; - out_8675559756142309217[15] = state[15]; - out_8675559756142309217[16] = state[16]; - out_8675559756142309217[17] = state[17]; +void f_fun(double *state, double dt, double *out_7013494318329414190) { + out_7013494318329414190[0] = atan2((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), -(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1])); + out_7013494318329414190[1] = asin(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8])); + out_7013494318329414190[2] = atan2(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), -(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2])); + out_7013494318329414190[3] = dt*state[12] + state[3]; + out_7013494318329414190[4] = dt*state[13] + state[4]; + out_7013494318329414190[5] = dt*state[14] + state[5]; + out_7013494318329414190[6] = state[6]; + out_7013494318329414190[7] = state[7]; + out_7013494318329414190[8] = state[8]; + out_7013494318329414190[9] = state[9]; + out_7013494318329414190[10] = state[10]; + out_7013494318329414190[11] = state[11]; + out_7013494318329414190[12] = state[12]; + out_7013494318329414190[13] = state[13]; + out_7013494318329414190[14] = state[14]; + out_7013494318329414190[15] = state[15]; + out_7013494318329414190[16] = state[16]; + out_7013494318329414190[17] = state[17]; } -void F_fun(double *state, double dt, double *out_4846751114242430980) { - out_4846751114242430980[0] = ((-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*cos(state[0])*cos(state[1]) - sin(state[0])*cos(dt*state[6])*cos(dt*state[7])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + ((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*cos(state[0])*cos(state[1]) - sin(dt*state[6])*sin(state[0])*cos(dt*state[7])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); - out_4846751114242430980[1] = ((-sin(dt*state[6])*sin(dt*state[8]) - sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*cos(state[1]) - (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*sin(state[1]) - sin(state[1])*cos(dt*state[6])*cos(dt*state[7])*cos(state[0]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*sin(state[1]) + (-sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) + sin(dt*state[8])*cos(dt*state[6]))*cos(state[1]) - sin(dt*state[6])*sin(state[1])*cos(dt*state[7])*cos(state[0]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); - out_4846751114242430980[2] = 0; - out_4846751114242430980[3] = 0; - out_4846751114242430980[4] = 0; - out_4846751114242430980[5] = 0; - out_4846751114242430980[6] = (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(dt*cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*sin(dt*state[8]) - dt*sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-dt*sin(dt*state[6])*cos(dt*state[8]) + dt*sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) - dt*cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (dt*sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); - out_4846751114242430980[7] = (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[6])*sin(dt*state[7])*cos(state[0])*cos(state[1]) + dt*sin(dt*state[6])*sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) - dt*sin(dt*state[6])*sin(state[1])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[7])*cos(dt*state[6])*cos(state[0])*cos(state[1]) + dt*sin(dt*state[8])*sin(state[0])*cos(dt*state[6])*cos(dt*state[7])*cos(state[1]) - dt*sin(state[1])*cos(dt*state[6])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); - out_4846751114242430980[8] = ((dt*sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + dt*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (dt*sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + ((dt*sin(dt*state[6])*sin(dt*state[8]) + dt*sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*cos(dt*state[8]) + dt*sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); - out_4846751114242430980[9] = 0; - out_4846751114242430980[10] = 0; - out_4846751114242430980[11] = 0; - out_4846751114242430980[12] = 0; - out_4846751114242430980[13] = 0; - out_4846751114242430980[14] = 0; - out_4846751114242430980[15] = 0; - out_4846751114242430980[16] = 0; - out_4846751114242430980[17] = 0; - out_4846751114242430980[18] = (-sin(dt*state[7])*sin(state[0])*cos(state[1]) - sin(dt*state[8])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); - out_4846751114242430980[19] = (-sin(dt*state[7])*sin(state[1])*cos(state[0]) + sin(dt*state[8])*sin(state[0])*sin(state[1])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); - out_4846751114242430980[20] = 0; - out_4846751114242430980[21] = 0; - out_4846751114242430980[22] = 0; - out_4846751114242430980[23] = 0; - out_4846751114242430980[24] = 0; - out_4846751114242430980[25] = (dt*sin(dt*state[7])*sin(dt*state[8])*sin(state[0])*cos(state[1]) - dt*sin(dt*state[7])*sin(state[1])*cos(dt*state[8]) + dt*cos(dt*state[7])*cos(state[0])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); - out_4846751114242430980[26] = (-dt*sin(dt*state[8])*sin(state[1])*cos(dt*state[7]) - dt*sin(state[0])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); - out_4846751114242430980[27] = 0; - out_4846751114242430980[28] = 0; - out_4846751114242430980[29] = 0; - out_4846751114242430980[30] = 0; - out_4846751114242430980[31] = 0; - out_4846751114242430980[32] = 0; - out_4846751114242430980[33] = 0; - out_4846751114242430980[34] = 0; - out_4846751114242430980[35] = 0; - out_4846751114242430980[36] = ((sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[7]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[7]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); - out_4846751114242430980[37] = (-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(-sin(dt*state[7])*sin(state[2])*cos(state[0])*cos(state[1]) + sin(dt*state[8])*sin(state[0])*sin(state[2])*cos(dt*state[7])*cos(state[1]) - sin(state[1])*sin(state[2])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*(-sin(dt*state[7])*cos(state[0])*cos(state[1])*cos(state[2]) + sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1])*cos(state[2]) - sin(state[1])*cos(dt*state[7])*cos(dt*state[8])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); - out_4846751114242430980[38] = ((-sin(state[0])*sin(state[2]) - sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (-sin(state[0])*sin(state[1])*sin(state[2]) - cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); - out_4846751114242430980[39] = 0; - out_4846751114242430980[40] = 0; - out_4846751114242430980[41] = 0; - out_4846751114242430980[42] = 0; - out_4846751114242430980[43] = (-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(dt*(sin(state[0])*cos(state[2]) - sin(state[1])*sin(state[2])*cos(state[0]))*cos(dt*state[7]) - dt*(sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[7])*sin(dt*state[8]) - dt*sin(dt*state[7])*sin(state[2])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*(dt*(-sin(state[0])*sin(state[2]) - sin(state[1])*cos(state[0])*cos(state[2]))*cos(dt*state[7]) - dt*(sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[7])*sin(dt*state[8]) - dt*sin(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); - out_4846751114242430980[44] = (dt*(sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*cos(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*sin(state[2])*cos(dt*state[7])*cos(state[1]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + (dt*(sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*cos(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[7])*cos(state[1])*cos(state[2]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); - out_4846751114242430980[45] = 0; - out_4846751114242430980[46] = 0; - out_4846751114242430980[47] = 0; - out_4846751114242430980[48] = 0; - out_4846751114242430980[49] = 0; - out_4846751114242430980[50] = 0; - out_4846751114242430980[51] = 0; - out_4846751114242430980[52] = 0; - out_4846751114242430980[53] = 0; - out_4846751114242430980[54] = 0; - out_4846751114242430980[55] = 0; - out_4846751114242430980[56] = 0; - out_4846751114242430980[57] = 1; - out_4846751114242430980[58] = 0; - out_4846751114242430980[59] = 0; - out_4846751114242430980[60] = 0; - out_4846751114242430980[61] = 0; - out_4846751114242430980[62] = 0; - out_4846751114242430980[63] = 0; - out_4846751114242430980[64] = 0; - out_4846751114242430980[65] = 0; - out_4846751114242430980[66] = dt; - out_4846751114242430980[67] = 0; - out_4846751114242430980[68] = 0; - out_4846751114242430980[69] = 0; - out_4846751114242430980[70] = 0; - out_4846751114242430980[71] = 0; - out_4846751114242430980[72] = 0; - out_4846751114242430980[73] = 0; - out_4846751114242430980[74] = 0; - out_4846751114242430980[75] = 0; - out_4846751114242430980[76] = 1; - out_4846751114242430980[77] = 0; - out_4846751114242430980[78] = 0; - out_4846751114242430980[79] = 0; - out_4846751114242430980[80] = 0; - out_4846751114242430980[81] = 0; - out_4846751114242430980[82] = 0; - out_4846751114242430980[83] = 0; - out_4846751114242430980[84] = 0; - out_4846751114242430980[85] = dt; - out_4846751114242430980[86] = 0; - out_4846751114242430980[87] = 0; - out_4846751114242430980[88] = 0; - out_4846751114242430980[89] = 0; - out_4846751114242430980[90] = 0; - out_4846751114242430980[91] = 0; - out_4846751114242430980[92] = 0; - out_4846751114242430980[93] = 0; - out_4846751114242430980[94] = 0; - out_4846751114242430980[95] = 1; - out_4846751114242430980[96] = 0; - out_4846751114242430980[97] = 0; - out_4846751114242430980[98] = 0; - out_4846751114242430980[99] = 0; - out_4846751114242430980[100] = 0; - out_4846751114242430980[101] = 0; - out_4846751114242430980[102] = 0; - out_4846751114242430980[103] = 0; - out_4846751114242430980[104] = dt; - out_4846751114242430980[105] = 0; - out_4846751114242430980[106] = 0; - out_4846751114242430980[107] = 0; - out_4846751114242430980[108] = 0; - out_4846751114242430980[109] = 0; - out_4846751114242430980[110] = 0; - out_4846751114242430980[111] = 0; - out_4846751114242430980[112] = 0; - out_4846751114242430980[113] = 0; - out_4846751114242430980[114] = 1; - out_4846751114242430980[115] = 0; - out_4846751114242430980[116] = 0; - out_4846751114242430980[117] = 0; - out_4846751114242430980[118] = 0; - out_4846751114242430980[119] = 0; - out_4846751114242430980[120] = 0; - out_4846751114242430980[121] = 0; - out_4846751114242430980[122] = 0; - out_4846751114242430980[123] = 0; - out_4846751114242430980[124] = 0; - out_4846751114242430980[125] = 0; - out_4846751114242430980[126] = 0; - out_4846751114242430980[127] = 0; - out_4846751114242430980[128] = 0; - out_4846751114242430980[129] = 0; - out_4846751114242430980[130] = 0; - out_4846751114242430980[131] = 0; - out_4846751114242430980[132] = 0; - out_4846751114242430980[133] = 1; - out_4846751114242430980[134] = 0; - out_4846751114242430980[135] = 0; - out_4846751114242430980[136] = 0; - out_4846751114242430980[137] = 0; - out_4846751114242430980[138] = 0; - out_4846751114242430980[139] = 0; - out_4846751114242430980[140] = 0; - out_4846751114242430980[141] = 0; - out_4846751114242430980[142] = 0; - out_4846751114242430980[143] = 0; - out_4846751114242430980[144] = 0; - out_4846751114242430980[145] = 0; - out_4846751114242430980[146] = 0; - out_4846751114242430980[147] = 0; - out_4846751114242430980[148] = 0; - out_4846751114242430980[149] = 0; - out_4846751114242430980[150] = 0; - out_4846751114242430980[151] = 0; - out_4846751114242430980[152] = 1; - out_4846751114242430980[153] = 0; - out_4846751114242430980[154] = 0; - out_4846751114242430980[155] = 0; - out_4846751114242430980[156] = 0; - out_4846751114242430980[157] = 0; - out_4846751114242430980[158] = 0; - out_4846751114242430980[159] = 0; - out_4846751114242430980[160] = 0; - out_4846751114242430980[161] = 0; - out_4846751114242430980[162] = 0; - out_4846751114242430980[163] = 0; - out_4846751114242430980[164] = 0; - out_4846751114242430980[165] = 0; - out_4846751114242430980[166] = 0; - out_4846751114242430980[167] = 0; - out_4846751114242430980[168] = 0; - out_4846751114242430980[169] = 0; - out_4846751114242430980[170] = 0; - out_4846751114242430980[171] = 1; - out_4846751114242430980[172] = 0; - out_4846751114242430980[173] = 0; - out_4846751114242430980[174] = 0; - out_4846751114242430980[175] = 0; - out_4846751114242430980[176] = 0; - out_4846751114242430980[177] = 0; - out_4846751114242430980[178] = 0; - out_4846751114242430980[179] = 0; - out_4846751114242430980[180] = 0; - out_4846751114242430980[181] = 0; - out_4846751114242430980[182] = 0; - out_4846751114242430980[183] = 0; - out_4846751114242430980[184] = 0; - out_4846751114242430980[185] = 0; - out_4846751114242430980[186] = 0; - out_4846751114242430980[187] = 0; - out_4846751114242430980[188] = 0; - out_4846751114242430980[189] = 0; - out_4846751114242430980[190] = 1; - out_4846751114242430980[191] = 0; - out_4846751114242430980[192] = 0; - out_4846751114242430980[193] = 0; - out_4846751114242430980[194] = 0; - out_4846751114242430980[195] = 0; - out_4846751114242430980[196] = 0; - out_4846751114242430980[197] = 0; - out_4846751114242430980[198] = 0; - out_4846751114242430980[199] = 0; - out_4846751114242430980[200] = 0; - out_4846751114242430980[201] = 0; - out_4846751114242430980[202] = 0; - out_4846751114242430980[203] = 0; - out_4846751114242430980[204] = 0; - out_4846751114242430980[205] = 0; - out_4846751114242430980[206] = 0; - out_4846751114242430980[207] = 0; - out_4846751114242430980[208] = 0; - out_4846751114242430980[209] = 1; - out_4846751114242430980[210] = 0; - out_4846751114242430980[211] = 0; - out_4846751114242430980[212] = 0; - out_4846751114242430980[213] = 0; - out_4846751114242430980[214] = 0; - out_4846751114242430980[215] = 0; - out_4846751114242430980[216] = 0; - out_4846751114242430980[217] = 0; - out_4846751114242430980[218] = 0; - out_4846751114242430980[219] = 0; - out_4846751114242430980[220] = 0; - out_4846751114242430980[221] = 0; - out_4846751114242430980[222] = 0; - out_4846751114242430980[223] = 0; - out_4846751114242430980[224] = 0; - out_4846751114242430980[225] = 0; - out_4846751114242430980[226] = 0; - out_4846751114242430980[227] = 0; - out_4846751114242430980[228] = 1; - out_4846751114242430980[229] = 0; - out_4846751114242430980[230] = 0; - out_4846751114242430980[231] = 0; - out_4846751114242430980[232] = 0; - out_4846751114242430980[233] = 0; - out_4846751114242430980[234] = 0; - out_4846751114242430980[235] = 0; - out_4846751114242430980[236] = 0; - out_4846751114242430980[237] = 0; - out_4846751114242430980[238] = 0; - out_4846751114242430980[239] = 0; - out_4846751114242430980[240] = 0; - out_4846751114242430980[241] = 0; - out_4846751114242430980[242] = 0; - out_4846751114242430980[243] = 0; - out_4846751114242430980[244] = 0; - out_4846751114242430980[245] = 0; - out_4846751114242430980[246] = 0; - out_4846751114242430980[247] = 1; - out_4846751114242430980[248] = 0; - out_4846751114242430980[249] = 0; - out_4846751114242430980[250] = 0; - out_4846751114242430980[251] = 0; - out_4846751114242430980[252] = 0; - out_4846751114242430980[253] = 0; - out_4846751114242430980[254] = 0; - out_4846751114242430980[255] = 0; - out_4846751114242430980[256] = 0; - out_4846751114242430980[257] = 0; - out_4846751114242430980[258] = 0; - out_4846751114242430980[259] = 0; - out_4846751114242430980[260] = 0; - out_4846751114242430980[261] = 0; - out_4846751114242430980[262] = 0; - out_4846751114242430980[263] = 0; - out_4846751114242430980[264] = 0; - out_4846751114242430980[265] = 0; - out_4846751114242430980[266] = 1; - out_4846751114242430980[267] = 0; - out_4846751114242430980[268] = 0; - out_4846751114242430980[269] = 0; - out_4846751114242430980[270] = 0; - out_4846751114242430980[271] = 0; - out_4846751114242430980[272] = 0; - out_4846751114242430980[273] = 0; - out_4846751114242430980[274] = 0; - out_4846751114242430980[275] = 0; - out_4846751114242430980[276] = 0; - out_4846751114242430980[277] = 0; - out_4846751114242430980[278] = 0; - out_4846751114242430980[279] = 0; - out_4846751114242430980[280] = 0; - out_4846751114242430980[281] = 0; - out_4846751114242430980[282] = 0; - out_4846751114242430980[283] = 0; - out_4846751114242430980[284] = 0; - out_4846751114242430980[285] = 1; - out_4846751114242430980[286] = 0; - out_4846751114242430980[287] = 0; - out_4846751114242430980[288] = 0; - out_4846751114242430980[289] = 0; - out_4846751114242430980[290] = 0; - out_4846751114242430980[291] = 0; - out_4846751114242430980[292] = 0; - out_4846751114242430980[293] = 0; - out_4846751114242430980[294] = 0; - out_4846751114242430980[295] = 0; - out_4846751114242430980[296] = 0; - out_4846751114242430980[297] = 0; - out_4846751114242430980[298] = 0; - out_4846751114242430980[299] = 0; - out_4846751114242430980[300] = 0; - out_4846751114242430980[301] = 0; - out_4846751114242430980[302] = 0; - out_4846751114242430980[303] = 0; - out_4846751114242430980[304] = 1; - out_4846751114242430980[305] = 0; - out_4846751114242430980[306] = 0; - out_4846751114242430980[307] = 0; - out_4846751114242430980[308] = 0; - out_4846751114242430980[309] = 0; - out_4846751114242430980[310] = 0; - out_4846751114242430980[311] = 0; - out_4846751114242430980[312] = 0; - out_4846751114242430980[313] = 0; - out_4846751114242430980[314] = 0; - out_4846751114242430980[315] = 0; - out_4846751114242430980[316] = 0; - out_4846751114242430980[317] = 0; - out_4846751114242430980[318] = 0; - out_4846751114242430980[319] = 0; - out_4846751114242430980[320] = 0; - out_4846751114242430980[321] = 0; - out_4846751114242430980[322] = 0; - out_4846751114242430980[323] = 1; +void F_fun(double *state, double dt, double *out_1354267763168931680) { + out_1354267763168931680[0] = ((-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*cos(state[0])*cos(state[1]) - sin(state[0])*cos(dt*state[6])*cos(dt*state[7])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + ((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*cos(state[0])*cos(state[1]) - sin(dt*state[6])*sin(state[0])*cos(dt*state[7])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); + out_1354267763168931680[1] = ((-sin(dt*state[6])*sin(dt*state[8]) - sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*cos(state[1]) - (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*sin(state[1]) - sin(state[1])*cos(dt*state[6])*cos(dt*state[7])*cos(state[0]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*sin(state[1]) + (-sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) + sin(dt*state[8])*cos(dt*state[6]))*cos(state[1]) - sin(dt*state[6])*sin(state[1])*cos(dt*state[7])*cos(state[0]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); + out_1354267763168931680[2] = 0; + out_1354267763168931680[3] = 0; + out_1354267763168931680[4] = 0; + out_1354267763168931680[5] = 0; + out_1354267763168931680[6] = (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(dt*cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*sin(dt*state[8]) - dt*sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-dt*sin(dt*state[6])*cos(dt*state[8]) + dt*sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) - dt*cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (dt*sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); + out_1354267763168931680[7] = (-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[6])*sin(dt*state[7])*cos(state[0])*cos(state[1]) + dt*sin(dt*state[6])*sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) - dt*sin(dt*state[6])*sin(state[1])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + (-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))*(-dt*sin(dt*state[7])*cos(dt*state[6])*cos(state[0])*cos(state[1]) + dt*sin(dt*state[8])*sin(state[0])*cos(dt*state[6])*cos(dt*state[7])*cos(state[1]) - dt*sin(state[1])*cos(dt*state[6])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); + out_1354267763168931680[8] = ((dt*sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + dt*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (dt*sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]))*(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)) + ((dt*sin(dt*state[6])*sin(dt*state[8]) + dt*sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (-dt*sin(dt*state[6])*cos(dt*state[8]) + dt*sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]))*(-(sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) + (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) - sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/(pow(-(sin(dt*state[6])*sin(dt*state[8]) + sin(dt*state[7])*cos(dt*state[6])*cos(dt*state[8]))*sin(state[1]) + (-sin(dt*state[6])*cos(dt*state[8]) + sin(dt*state[7])*sin(dt*state[8])*cos(dt*state[6]))*sin(state[0])*cos(state[1]) + cos(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2) + pow((sin(dt*state[6])*sin(dt*state[7])*sin(dt*state[8]) + cos(dt*state[6])*cos(dt*state[8]))*sin(state[0])*cos(state[1]) - (sin(dt*state[6])*sin(dt*state[7])*cos(dt*state[8]) - sin(dt*state[8])*cos(dt*state[6]))*sin(state[1]) + sin(dt*state[6])*cos(dt*state[7])*cos(state[0])*cos(state[1]), 2)); + out_1354267763168931680[9] = 0; + out_1354267763168931680[10] = 0; + out_1354267763168931680[11] = 0; + out_1354267763168931680[12] = 0; + out_1354267763168931680[13] = 0; + out_1354267763168931680[14] = 0; + out_1354267763168931680[15] = 0; + out_1354267763168931680[16] = 0; + out_1354267763168931680[17] = 0; + out_1354267763168931680[18] = (-sin(dt*state[7])*sin(state[0])*cos(state[1]) - sin(dt*state[8])*cos(dt*state[7])*cos(state[0])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); + out_1354267763168931680[19] = (-sin(dt*state[7])*sin(state[1])*cos(state[0]) + sin(dt*state[8])*sin(state[0])*sin(state[1])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); + out_1354267763168931680[20] = 0; + out_1354267763168931680[21] = 0; + out_1354267763168931680[22] = 0; + out_1354267763168931680[23] = 0; + out_1354267763168931680[24] = 0; + out_1354267763168931680[25] = (dt*sin(dt*state[7])*sin(dt*state[8])*sin(state[0])*cos(state[1]) - dt*sin(dt*state[7])*sin(state[1])*cos(dt*state[8]) + dt*cos(dt*state[7])*cos(state[0])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); + out_1354267763168931680[26] = (-dt*sin(dt*state[8])*sin(state[1])*cos(dt*state[7]) - dt*sin(state[0])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/sqrt(1 - pow(sin(dt*state[7])*cos(state[0])*cos(state[1]) - sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1]) + sin(state[1])*cos(dt*state[7])*cos(dt*state[8]), 2)); + out_1354267763168931680[27] = 0; + out_1354267763168931680[28] = 0; + out_1354267763168931680[29] = 0; + out_1354267763168931680[30] = 0; + out_1354267763168931680[31] = 0; + out_1354267763168931680[32] = 0; + out_1354267763168931680[33] = 0; + out_1354267763168931680[34] = 0; + out_1354267763168931680[35] = 0; + out_1354267763168931680[36] = ((sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[7]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[7]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); + out_1354267763168931680[37] = (-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(-sin(dt*state[7])*sin(state[2])*cos(state[0])*cos(state[1]) + sin(dt*state[8])*sin(state[0])*sin(state[2])*cos(dt*state[7])*cos(state[1]) - sin(state[1])*sin(state[2])*cos(dt*state[7])*cos(dt*state[8]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*(-sin(dt*state[7])*cos(state[0])*cos(state[1])*cos(state[2]) + sin(dt*state[8])*sin(state[0])*cos(dt*state[7])*cos(state[1])*cos(state[2]) - sin(state[1])*cos(dt*state[7])*cos(dt*state[8])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); + out_1354267763168931680[38] = ((-sin(state[0])*sin(state[2]) - sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (-sin(state[0])*sin(state[1])*sin(state[2]) - cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); + out_1354267763168931680[39] = 0; + out_1354267763168931680[40] = 0; + out_1354267763168931680[41] = 0; + out_1354267763168931680[42] = 0; + out_1354267763168931680[43] = (-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))*(dt*(sin(state[0])*cos(state[2]) - sin(state[1])*sin(state[2])*cos(state[0]))*cos(dt*state[7]) - dt*(sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[7])*sin(dt*state[8]) - dt*sin(dt*state[7])*sin(state[2])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + ((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))*(dt*(-sin(state[0])*sin(state[2]) - sin(state[1])*cos(state[0])*cos(state[2]))*cos(dt*state[7]) - dt*(sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[7])*sin(dt*state[8]) - dt*sin(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); + out_1354267763168931680[44] = (dt*(sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*cos(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*sin(state[2])*cos(dt*state[7])*cos(state[1]))*(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)) + (dt*(sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*cos(dt*state[7])*cos(dt*state[8]) - dt*sin(dt*state[8])*cos(dt*state[7])*cos(state[1])*cos(state[2]))*((-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) - (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) - sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]))/(pow(-(sin(state[0])*sin(state[2]) + sin(state[1])*cos(state[0])*cos(state[2]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*cos(state[2]) - sin(state[2])*cos(state[0]))*sin(dt*state[8])*cos(dt*state[7]) + cos(dt*state[7])*cos(dt*state[8])*cos(state[1])*cos(state[2]), 2) + pow(-(-sin(state[0])*cos(state[2]) + sin(state[1])*sin(state[2])*cos(state[0]))*sin(dt*state[7]) + (sin(state[0])*sin(state[1])*sin(state[2]) + cos(state[0])*cos(state[2]))*sin(dt*state[8])*cos(dt*state[7]) + sin(state[2])*cos(dt*state[7])*cos(dt*state[8])*cos(state[1]), 2)); + out_1354267763168931680[45] = 0; + out_1354267763168931680[46] = 0; + out_1354267763168931680[47] = 0; + out_1354267763168931680[48] = 0; + out_1354267763168931680[49] = 0; + out_1354267763168931680[50] = 0; + out_1354267763168931680[51] = 0; + out_1354267763168931680[52] = 0; + out_1354267763168931680[53] = 0; + out_1354267763168931680[54] = 0; + out_1354267763168931680[55] = 0; + out_1354267763168931680[56] = 0; + out_1354267763168931680[57] = 1; + out_1354267763168931680[58] = 0; + out_1354267763168931680[59] = 0; + out_1354267763168931680[60] = 0; + out_1354267763168931680[61] = 0; + out_1354267763168931680[62] = 0; + out_1354267763168931680[63] = 0; + out_1354267763168931680[64] = 0; + out_1354267763168931680[65] = 0; + out_1354267763168931680[66] = dt; + out_1354267763168931680[67] = 0; + out_1354267763168931680[68] = 0; + out_1354267763168931680[69] = 0; + out_1354267763168931680[70] = 0; + out_1354267763168931680[71] = 0; + out_1354267763168931680[72] = 0; + out_1354267763168931680[73] = 0; + out_1354267763168931680[74] = 0; + out_1354267763168931680[75] = 0; + out_1354267763168931680[76] = 1; + out_1354267763168931680[77] = 0; + out_1354267763168931680[78] = 0; + out_1354267763168931680[79] = 0; + out_1354267763168931680[80] = 0; + out_1354267763168931680[81] = 0; + out_1354267763168931680[82] = 0; + out_1354267763168931680[83] = 0; + out_1354267763168931680[84] = 0; + out_1354267763168931680[85] = dt; + out_1354267763168931680[86] = 0; + out_1354267763168931680[87] = 0; + out_1354267763168931680[88] = 0; + out_1354267763168931680[89] = 0; + out_1354267763168931680[90] = 0; + out_1354267763168931680[91] = 0; + out_1354267763168931680[92] = 0; + out_1354267763168931680[93] = 0; + out_1354267763168931680[94] = 0; + out_1354267763168931680[95] = 1; + out_1354267763168931680[96] = 0; + out_1354267763168931680[97] = 0; + out_1354267763168931680[98] = 0; + out_1354267763168931680[99] = 0; + out_1354267763168931680[100] = 0; + out_1354267763168931680[101] = 0; + out_1354267763168931680[102] = 0; + out_1354267763168931680[103] = 0; + out_1354267763168931680[104] = dt; + out_1354267763168931680[105] = 0; + out_1354267763168931680[106] = 0; + out_1354267763168931680[107] = 0; + out_1354267763168931680[108] = 0; + out_1354267763168931680[109] = 0; + out_1354267763168931680[110] = 0; + out_1354267763168931680[111] = 0; + out_1354267763168931680[112] = 0; + out_1354267763168931680[113] = 0; + out_1354267763168931680[114] = 1; + out_1354267763168931680[115] = 0; + out_1354267763168931680[116] = 0; + out_1354267763168931680[117] = 0; + out_1354267763168931680[118] = 0; + out_1354267763168931680[119] = 0; + out_1354267763168931680[120] = 0; + out_1354267763168931680[121] = 0; + out_1354267763168931680[122] = 0; + out_1354267763168931680[123] = 0; + out_1354267763168931680[124] = 0; + out_1354267763168931680[125] = 0; + out_1354267763168931680[126] = 0; + out_1354267763168931680[127] = 0; + out_1354267763168931680[128] = 0; + out_1354267763168931680[129] = 0; + out_1354267763168931680[130] = 0; + out_1354267763168931680[131] = 0; + out_1354267763168931680[132] = 0; + out_1354267763168931680[133] = 1; + out_1354267763168931680[134] = 0; + out_1354267763168931680[135] = 0; + out_1354267763168931680[136] = 0; + out_1354267763168931680[137] = 0; + out_1354267763168931680[138] = 0; + out_1354267763168931680[139] = 0; + out_1354267763168931680[140] = 0; + out_1354267763168931680[141] = 0; + out_1354267763168931680[142] = 0; + out_1354267763168931680[143] = 0; + out_1354267763168931680[144] = 0; + out_1354267763168931680[145] = 0; + out_1354267763168931680[146] = 0; + out_1354267763168931680[147] = 0; + out_1354267763168931680[148] = 0; + out_1354267763168931680[149] = 0; + out_1354267763168931680[150] = 0; + out_1354267763168931680[151] = 0; + out_1354267763168931680[152] = 1; + out_1354267763168931680[153] = 0; + out_1354267763168931680[154] = 0; + out_1354267763168931680[155] = 0; + out_1354267763168931680[156] = 0; + out_1354267763168931680[157] = 0; + out_1354267763168931680[158] = 0; + out_1354267763168931680[159] = 0; + out_1354267763168931680[160] = 0; + out_1354267763168931680[161] = 0; + out_1354267763168931680[162] = 0; + out_1354267763168931680[163] = 0; + out_1354267763168931680[164] = 0; + out_1354267763168931680[165] = 0; + out_1354267763168931680[166] = 0; + out_1354267763168931680[167] = 0; + out_1354267763168931680[168] = 0; + out_1354267763168931680[169] = 0; + out_1354267763168931680[170] = 0; + out_1354267763168931680[171] = 1; + out_1354267763168931680[172] = 0; + out_1354267763168931680[173] = 0; + out_1354267763168931680[174] = 0; + out_1354267763168931680[175] = 0; + out_1354267763168931680[176] = 0; + out_1354267763168931680[177] = 0; + out_1354267763168931680[178] = 0; + out_1354267763168931680[179] = 0; + out_1354267763168931680[180] = 0; + out_1354267763168931680[181] = 0; + out_1354267763168931680[182] = 0; + out_1354267763168931680[183] = 0; + out_1354267763168931680[184] = 0; + out_1354267763168931680[185] = 0; + out_1354267763168931680[186] = 0; + out_1354267763168931680[187] = 0; + out_1354267763168931680[188] = 0; + out_1354267763168931680[189] = 0; + out_1354267763168931680[190] = 1; + out_1354267763168931680[191] = 0; + out_1354267763168931680[192] = 0; + out_1354267763168931680[193] = 0; + out_1354267763168931680[194] = 0; + out_1354267763168931680[195] = 0; + out_1354267763168931680[196] = 0; + out_1354267763168931680[197] = 0; + out_1354267763168931680[198] = 0; + out_1354267763168931680[199] = 0; + out_1354267763168931680[200] = 0; + out_1354267763168931680[201] = 0; + out_1354267763168931680[202] = 0; + out_1354267763168931680[203] = 0; + out_1354267763168931680[204] = 0; + out_1354267763168931680[205] = 0; + out_1354267763168931680[206] = 0; + out_1354267763168931680[207] = 0; + out_1354267763168931680[208] = 0; + out_1354267763168931680[209] = 1; + out_1354267763168931680[210] = 0; + out_1354267763168931680[211] = 0; + out_1354267763168931680[212] = 0; + out_1354267763168931680[213] = 0; + out_1354267763168931680[214] = 0; + out_1354267763168931680[215] = 0; + out_1354267763168931680[216] = 0; + out_1354267763168931680[217] = 0; + out_1354267763168931680[218] = 0; + out_1354267763168931680[219] = 0; + out_1354267763168931680[220] = 0; + out_1354267763168931680[221] = 0; + out_1354267763168931680[222] = 0; + out_1354267763168931680[223] = 0; + out_1354267763168931680[224] = 0; + out_1354267763168931680[225] = 0; + out_1354267763168931680[226] = 0; + out_1354267763168931680[227] = 0; + out_1354267763168931680[228] = 1; + out_1354267763168931680[229] = 0; + out_1354267763168931680[230] = 0; + out_1354267763168931680[231] = 0; + out_1354267763168931680[232] = 0; + out_1354267763168931680[233] = 0; + out_1354267763168931680[234] = 0; + out_1354267763168931680[235] = 0; + out_1354267763168931680[236] = 0; + out_1354267763168931680[237] = 0; + out_1354267763168931680[238] = 0; + out_1354267763168931680[239] = 0; + out_1354267763168931680[240] = 0; + out_1354267763168931680[241] = 0; + out_1354267763168931680[242] = 0; + out_1354267763168931680[243] = 0; + out_1354267763168931680[244] = 0; + out_1354267763168931680[245] = 0; + out_1354267763168931680[246] = 0; + out_1354267763168931680[247] = 1; + out_1354267763168931680[248] = 0; + out_1354267763168931680[249] = 0; + out_1354267763168931680[250] = 0; + out_1354267763168931680[251] = 0; + out_1354267763168931680[252] = 0; + out_1354267763168931680[253] = 0; + out_1354267763168931680[254] = 0; + out_1354267763168931680[255] = 0; + out_1354267763168931680[256] = 0; + out_1354267763168931680[257] = 0; + out_1354267763168931680[258] = 0; + out_1354267763168931680[259] = 0; + out_1354267763168931680[260] = 0; + out_1354267763168931680[261] = 0; + out_1354267763168931680[262] = 0; + out_1354267763168931680[263] = 0; + out_1354267763168931680[264] = 0; + out_1354267763168931680[265] = 0; + out_1354267763168931680[266] = 1; + out_1354267763168931680[267] = 0; + out_1354267763168931680[268] = 0; + out_1354267763168931680[269] = 0; + out_1354267763168931680[270] = 0; + out_1354267763168931680[271] = 0; + out_1354267763168931680[272] = 0; + out_1354267763168931680[273] = 0; + out_1354267763168931680[274] = 0; + out_1354267763168931680[275] = 0; + out_1354267763168931680[276] = 0; + out_1354267763168931680[277] = 0; + out_1354267763168931680[278] = 0; + out_1354267763168931680[279] = 0; + out_1354267763168931680[280] = 0; + out_1354267763168931680[281] = 0; + out_1354267763168931680[282] = 0; + out_1354267763168931680[283] = 0; + out_1354267763168931680[284] = 0; + out_1354267763168931680[285] = 1; + out_1354267763168931680[286] = 0; + out_1354267763168931680[287] = 0; + out_1354267763168931680[288] = 0; + out_1354267763168931680[289] = 0; + out_1354267763168931680[290] = 0; + out_1354267763168931680[291] = 0; + out_1354267763168931680[292] = 0; + out_1354267763168931680[293] = 0; + out_1354267763168931680[294] = 0; + out_1354267763168931680[295] = 0; + out_1354267763168931680[296] = 0; + out_1354267763168931680[297] = 0; + out_1354267763168931680[298] = 0; + out_1354267763168931680[299] = 0; + out_1354267763168931680[300] = 0; + out_1354267763168931680[301] = 0; + out_1354267763168931680[302] = 0; + out_1354267763168931680[303] = 0; + out_1354267763168931680[304] = 1; + out_1354267763168931680[305] = 0; + out_1354267763168931680[306] = 0; + out_1354267763168931680[307] = 0; + out_1354267763168931680[308] = 0; + out_1354267763168931680[309] = 0; + out_1354267763168931680[310] = 0; + out_1354267763168931680[311] = 0; + out_1354267763168931680[312] = 0; + out_1354267763168931680[313] = 0; + out_1354267763168931680[314] = 0; + out_1354267763168931680[315] = 0; + out_1354267763168931680[316] = 0; + out_1354267763168931680[317] = 0; + out_1354267763168931680[318] = 0; + out_1354267763168931680[319] = 0; + out_1354267763168931680[320] = 0; + out_1354267763168931680[321] = 0; + out_1354267763168931680[322] = 0; + out_1354267763168931680[323] = 1; } -void h_4(double *state, double *unused, double *out_5930999592870125556) { - out_5930999592870125556[0] = state[6] + state[9]; - out_5930999592870125556[1] = state[7] + state[10]; - out_5930999592870125556[2] = state[8] + state[11]; +void h_4(double *state, double *unused, double *out_4996940222577203074) { + out_4996940222577203074[0] = state[6] + state[9]; + out_4996940222577203074[1] = state[7] + state[10]; + out_4996940222577203074[2] = state[8] + state[11]; } -void H_4(double *state, double *unused, double *out_5602157340699375302) { - out_5602157340699375302[0] = 0; - out_5602157340699375302[1] = 0; - out_5602157340699375302[2] = 0; - out_5602157340699375302[3] = 0; - out_5602157340699375302[4] = 0; - out_5602157340699375302[5] = 0; - out_5602157340699375302[6] = 1; - out_5602157340699375302[7] = 0; - out_5602157340699375302[8] = 0; - out_5602157340699375302[9] = 1; - out_5602157340699375302[10] = 0; - out_5602157340699375302[11] = 0; - out_5602157340699375302[12] = 0; - out_5602157340699375302[13] = 0; - out_5602157340699375302[14] = 0; - out_5602157340699375302[15] = 0; - out_5602157340699375302[16] = 0; - out_5602157340699375302[17] = 0; - out_5602157340699375302[18] = 0; - out_5602157340699375302[19] = 0; - out_5602157340699375302[20] = 0; - out_5602157340699375302[21] = 0; - out_5602157340699375302[22] = 0; - out_5602157340699375302[23] = 0; - out_5602157340699375302[24] = 0; - out_5602157340699375302[25] = 1; - out_5602157340699375302[26] = 0; - out_5602157340699375302[27] = 0; - out_5602157340699375302[28] = 1; - out_5602157340699375302[29] = 0; - out_5602157340699375302[30] = 0; - out_5602157340699375302[31] = 0; - out_5602157340699375302[32] = 0; - out_5602157340699375302[33] = 0; - out_5602157340699375302[34] = 0; - out_5602157340699375302[35] = 0; - out_5602157340699375302[36] = 0; - out_5602157340699375302[37] = 0; - out_5602157340699375302[38] = 0; - out_5602157340699375302[39] = 0; - out_5602157340699375302[40] = 0; - out_5602157340699375302[41] = 0; - out_5602157340699375302[42] = 0; - out_5602157340699375302[43] = 0; - out_5602157340699375302[44] = 1; - out_5602157340699375302[45] = 0; - out_5602157340699375302[46] = 0; - out_5602157340699375302[47] = 1; - out_5602157340699375302[48] = 0; - out_5602157340699375302[49] = 0; - out_5602157340699375302[50] = 0; - out_5602157340699375302[51] = 0; - out_5602157340699375302[52] = 0; - out_5602157340699375302[53] = 0; +void H_4(double *state, double *unused, double *out_1403322073353066430) { + out_1403322073353066430[0] = 0; + out_1403322073353066430[1] = 0; + out_1403322073353066430[2] = 0; + out_1403322073353066430[3] = 0; + out_1403322073353066430[4] = 0; + out_1403322073353066430[5] = 0; + out_1403322073353066430[6] = 1; + out_1403322073353066430[7] = 0; + out_1403322073353066430[8] = 0; + out_1403322073353066430[9] = 1; + out_1403322073353066430[10] = 0; + out_1403322073353066430[11] = 0; + out_1403322073353066430[12] = 0; + out_1403322073353066430[13] = 0; + out_1403322073353066430[14] = 0; + out_1403322073353066430[15] = 0; + out_1403322073353066430[16] = 0; + out_1403322073353066430[17] = 0; + out_1403322073353066430[18] = 0; + out_1403322073353066430[19] = 0; + out_1403322073353066430[20] = 0; + out_1403322073353066430[21] = 0; + out_1403322073353066430[22] = 0; + out_1403322073353066430[23] = 0; + out_1403322073353066430[24] = 0; + out_1403322073353066430[25] = 1; + out_1403322073353066430[26] = 0; + out_1403322073353066430[27] = 0; + out_1403322073353066430[28] = 1; + out_1403322073353066430[29] = 0; + out_1403322073353066430[30] = 0; + out_1403322073353066430[31] = 0; + out_1403322073353066430[32] = 0; + out_1403322073353066430[33] = 0; + out_1403322073353066430[34] = 0; + out_1403322073353066430[35] = 0; + out_1403322073353066430[36] = 0; + out_1403322073353066430[37] = 0; + out_1403322073353066430[38] = 0; + out_1403322073353066430[39] = 0; + out_1403322073353066430[40] = 0; + out_1403322073353066430[41] = 0; + out_1403322073353066430[42] = 0; + out_1403322073353066430[43] = 0; + out_1403322073353066430[44] = 1; + out_1403322073353066430[45] = 0; + out_1403322073353066430[46] = 0; + out_1403322073353066430[47] = 1; + out_1403322073353066430[48] = 0; + out_1403322073353066430[49] = 0; + out_1403322073353066430[50] = 0; + out_1403322073353066430[51] = 0; + out_1403322073353066430[52] = 0; + out_1403322073353066430[53] = 0; } -void h_10(double *state, double *unused, double *out_5557120776990141355) { - out_5557120776990141355[0] = 9.8100000000000005*sin(state[1]) - state[4]*state[8] + state[5]*state[7] + state[12] + state[15]; - out_5557120776990141355[1] = -9.8100000000000005*sin(state[0])*cos(state[1]) + state[3]*state[8] - state[5]*state[6] + state[13] + state[16]; - out_5557120776990141355[2] = -9.8100000000000005*cos(state[0])*cos(state[1]) - state[3]*state[7] + state[4]*state[6] + state[14] + state[17]; +void h_10(double *state, double *unused, double *out_4736471881593411299) { + out_4736471881593411299[0] = 9.8100000000000005*sin(state[1]) - state[4]*state[8] + state[5]*state[7] + state[12] + state[15]; + out_4736471881593411299[1] = -9.8100000000000005*sin(state[0])*cos(state[1]) + state[3]*state[8] - state[5]*state[6] + state[13] + state[16]; + out_4736471881593411299[2] = -9.8100000000000005*cos(state[0])*cos(state[1]) - state[3]*state[7] + state[4]*state[6] + state[14] + state[17]; } -void H_10(double *state, double *unused, double *out_1023238183635137507) { - out_1023238183635137507[0] = 0; - out_1023238183635137507[1] = 9.8100000000000005*cos(state[1]); - out_1023238183635137507[2] = 0; - out_1023238183635137507[3] = 0; - out_1023238183635137507[4] = -state[8]; - out_1023238183635137507[5] = state[7]; - out_1023238183635137507[6] = 0; - out_1023238183635137507[7] = state[5]; - out_1023238183635137507[8] = -state[4]; - out_1023238183635137507[9] = 0; - out_1023238183635137507[10] = 0; - out_1023238183635137507[11] = 0; - out_1023238183635137507[12] = 1; - out_1023238183635137507[13] = 0; - out_1023238183635137507[14] = 0; - out_1023238183635137507[15] = 1; - out_1023238183635137507[16] = 0; - out_1023238183635137507[17] = 0; - out_1023238183635137507[18] = -9.8100000000000005*cos(state[0])*cos(state[1]); - out_1023238183635137507[19] = 9.8100000000000005*sin(state[0])*sin(state[1]); - out_1023238183635137507[20] = 0; - out_1023238183635137507[21] = state[8]; - out_1023238183635137507[22] = 0; - out_1023238183635137507[23] = -state[6]; - out_1023238183635137507[24] = -state[5]; - out_1023238183635137507[25] = 0; - out_1023238183635137507[26] = state[3]; - out_1023238183635137507[27] = 0; - out_1023238183635137507[28] = 0; - out_1023238183635137507[29] = 0; - out_1023238183635137507[30] = 0; - out_1023238183635137507[31] = 1; - out_1023238183635137507[32] = 0; - out_1023238183635137507[33] = 0; - out_1023238183635137507[34] = 1; - out_1023238183635137507[35] = 0; - out_1023238183635137507[36] = 9.8100000000000005*sin(state[0])*cos(state[1]); - out_1023238183635137507[37] = 9.8100000000000005*sin(state[1])*cos(state[0]); - out_1023238183635137507[38] = 0; - out_1023238183635137507[39] = -state[7]; - out_1023238183635137507[40] = state[6]; - out_1023238183635137507[41] = 0; - out_1023238183635137507[42] = state[4]; - out_1023238183635137507[43] = -state[3]; - out_1023238183635137507[44] = 0; - out_1023238183635137507[45] = 0; - out_1023238183635137507[46] = 0; - out_1023238183635137507[47] = 0; - out_1023238183635137507[48] = 0; - out_1023238183635137507[49] = 0; - out_1023238183635137507[50] = 1; - out_1023238183635137507[51] = 0; - out_1023238183635137507[52] = 0; - out_1023238183635137507[53] = 1; +void H_10(double *state, double *unused, double *out_6592862647789865695) { + out_6592862647789865695[0] = 0; + out_6592862647789865695[1] = 9.8100000000000005*cos(state[1]); + out_6592862647789865695[2] = 0; + out_6592862647789865695[3] = 0; + out_6592862647789865695[4] = -state[8]; + out_6592862647789865695[5] = state[7]; + out_6592862647789865695[6] = 0; + out_6592862647789865695[7] = state[5]; + out_6592862647789865695[8] = -state[4]; + out_6592862647789865695[9] = 0; + out_6592862647789865695[10] = 0; + out_6592862647789865695[11] = 0; + out_6592862647789865695[12] = 1; + out_6592862647789865695[13] = 0; + out_6592862647789865695[14] = 0; + out_6592862647789865695[15] = 1; + out_6592862647789865695[16] = 0; + out_6592862647789865695[17] = 0; + out_6592862647789865695[18] = -9.8100000000000005*cos(state[0])*cos(state[1]); + out_6592862647789865695[19] = 9.8100000000000005*sin(state[0])*sin(state[1]); + out_6592862647789865695[20] = 0; + out_6592862647789865695[21] = state[8]; + out_6592862647789865695[22] = 0; + out_6592862647789865695[23] = -state[6]; + out_6592862647789865695[24] = -state[5]; + out_6592862647789865695[25] = 0; + out_6592862647789865695[26] = state[3]; + out_6592862647789865695[27] = 0; + out_6592862647789865695[28] = 0; + out_6592862647789865695[29] = 0; + out_6592862647789865695[30] = 0; + out_6592862647789865695[31] = 1; + out_6592862647789865695[32] = 0; + out_6592862647789865695[33] = 0; + out_6592862647789865695[34] = 1; + out_6592862647789865695[35] = 0; + out_6592862647789865695[36] = 9.8100000000000005*sin(state[0])*cos(state[1]); + out_6592862647789865695[37] = 9.8100000000000005*sin(state[1])*cos(state[0]); + out_6592862647789865695[38] = 0; + out_6592862647789865695[39] = -state[7]; + out_6592862647789865695[40] = state[6]; + out_6592862647789865695[41] = 0; + out_6592862647789865695[42] = state[4]; + out_6592862647789865695[43] = -state[3]; + out_6592862647789865695[44] = 0; + out_6592862647789865695[45] = 0; + out_6592862647789865695[46] = 0; + out_6592862647789865695[47] = 0; + out_6592862647789865695[48] = 0; + out_6592862647789865695[49] = 0; + out_6592862647789865695[50] = 1; + out_6592862647789865695[51] = 0; + out_6592862647789865695[52] = 0; + out_6592862647789865695[53] = 1; } -void h_13(double *state, double *unused, double *out_6353105533166408740) { - out_6353105533166408740[0] = state[3]; - out_6353105533166408740[1] = state[4]; - out_6353105533166408740[2] = state[5]; +void h_13(double *state, double *unused, double *out_4300313025089579851) { + out_4300313025089579851[0] = state[3]; + out_4300313025089579851[1] = state[4]; + out_4300313025089579851[2] = state[5]; } -void H_13(double *state, double *unused, double *out_2008473867617325627) { - out_2008473867617325627[0] = 0; - out_2008473867617325627[1] = 0; - out_2008473867617325627[2] = 0; - out_2008473867617325627[3] = 1; - out_2008473867617325627[4] = 0; - out_2008473867617325627[5] = 0; - out_2008473867617325627[6] = 0; - out_2008473867617325627[7] = 0; - out_2008473867617325627[8] = 0; - out_2008473867617325627[9] = 0; - out_2008473867617325627[10] = 0; - out_2008473867617325627[11] = 0; - out_2008473867617325627[12] = 0; - out_2008473867617325627[13] = 0; - out_2008473867617325627[14] = 0; - out_2008473867617325627[15] = 0; - out_2008473867617325627[16] = 0; - out_2008473867617325627[17] = 0; - out_2008473867617325627[18] = 0; - out_2008473867617325627[19] = 0; - out_2008473867617325627[20] = 0; - out_2008473867617325627[21] = 0; - out_2008473867617325627[22] = 1; - out_2008473867617325627[23] = 0; - out_2008473867617325627[24] = 0; - out_2008473867617325627[25] = 0; - out_2008473867617325627[26] = 0; - out_2008473867617325627[27] = 0; - out_2008473867617325627[28] = 0; - out_2008473867617325627[29] = 0; - out_2008473867617325627[30] = 0; - out_2008473867617325627[31] = 0; - out_2008473867617325627[32] = 0; - out_2008473867617325627[33] = 0; - out_2008473867617325627[34] = 0; - out_2008473867617325627[35] = 0; - out_2008473867617325627[36] = 0; - out_2008473867617325627[37] = 0; - out_2008473867617325627[38] = 0; - out_2008473867617325627[39] = 0; - out_2008473867617325627[40] = 0; - out_2008473867617325627[41] = 1; - out_2008473867617325627[42] = 0; - out_2008473867617325627[43] = 0; - out_2008473867617325627[44] = 0; - out_2008473867617325627[45] = 0; - out_2008473867617325627[46] = 0; - out_2008473867617325627[47] = 0; - out_2008473867617325627[48] = 0; - out_2008473867617325627[49] = 0; - out_2008473867617325627[50] = 0; - out_2008473867617325627[51] = 0; - out_2008473867617325627[52] = 0; - out_2008473867617325627[53] = 0; +void H_13(double *state, double *unused, double *out_4615595898685399231) { + out_4615595898685399231[0] = 0; + out_4615595898685399231[1] = 0; + out_4615595898685399231[2] = 0; + out_4615595898685399231[3] = 1; + out_4615595898685399231[4] = 0; + out_4615595898685399231[5] = 0; + out_4615595898685399231[6] = 0; + out_4615595898685399231[7] = 0; + out_4615595898685399231[8] = 0; + out_4615595898685399231[9] = 0; + out_4615595898685399231[10] = 0; + out_4615595898685399231[11] = 0; + out_4615595898685399231[12] = 0; + out_4615595898685399231[13] = 0; + out_4615595898685399231[14] = 0; + out_4615595898685399231[15] = 0; + out_4615595898685399231[16] = 0; + out_4615595898685399231[17] = 0; + out_4615595898685399231[18] = 0; + out_4615595898685399231[19] = 0; + out_4615595898685399231[20] = 0; + out_4615595898685399231[21] = 0; + out_4615595898685399231[22] = 1; + out_4615595898685399231[23] = 0; + out_4615595898685399231[24] = 0; + out_4615595898685399231[25] = 0; + out_4615595898685399231[26] = 0; + out_4615595898685399231[27] = 0; + out_4615595898685399231[28] = 0; + out_4615595898685399231[29] = 0; + out_4615595898685399231[30] = 0; + out_4615595898685399231[31] = 0; + out_4615595898685399231[32] = 0; + out_4615595898685399231[33] = 0; + out_4615595898685399231[34] = 0; + out_4615595898685399231[35] = 0; + out_4615595898685399231[36] = 0; + out_4615595898685399231[37] = 0; + out_4615595898685399231[38] = 0; + out_4615595898685399231[39] = 0; + out_4615595898685399231[40] = 0; + out_4615595898685399231[41] = 1; + out_4615595898685399231[42] = 0; + out_4615595898685399231[43] = 0; + out_4615595898685399231[44] = 0; + out_4615595898685399231[45] = 0; + out_4615595898685399231[46] = 0; + out_4615595898685399231[47] = 0; + out_4615595898685399231[48] = 0; + out_4615595898685399231[49] = 0; + out_4615595898685399231[50] = 0; + out_4615595898685399231[51] = 0; + out_4615595898685399231[52] = 0; + out_4615595898685399231[53] = 0; } -void h_14(double *state, double *unused, double *out_3322199193100514196) { - out_3322199193100514196[0] = state[6]; - out_3322199193100514196[1] = state[7]; - out_3322199193100514196[2] = state[8]; +void h_14(double *state, double *unused, double *out_4861809331317933851) { + out_4861809331317933851[0] = state[6]; + out_4861809331317933851[1] = state[7]; + out_4861809331317933851[2] = state[8]; } -void H_14(double *state, double *unused, double *out_8684945772994747598) { - out_8684945772994747598[0] = 0; - out_8684945772994747598[1] = 0; - out_8684945772994747598[2] = 0; - out_8684945772994747598[3] = 0; - out_8684945772994747598[4] = 0; - out_8684945772994747598[5] = 0; - out_8684945772994747598[6] = 1; - out_8684945772994747598[7] = 0; - out_8684945772994747598[8] = 0; - out_8684945772994747598[9] = 0; - out_8684945772994747598[10] = 0; - out_8684945772994747598[11] = 0; - out_8684945772994747598[12] = 0; - out_8684945772994747598[13] = 0; - out_8684945772994747598[14] = 0; - out_8684945772994747598[15] = 0; - out_8684945772994747598[16] = 0; - out_8684945772994747598[17] = 0; - out_8684945772994747598[18] = 0; - out_8684945772994747598[19] = 0; - out_8684945772994747598[20] = 0; - out_8684945772994747598[21] = 0; - out_8684945772994747598[22] = 0; - out_8684945772994747598[23] = 0; - out_8684945772994747598[24] = 0; - out_8684945772994747598[25] = 1; - out_8684945772994747598[26] = 0; - out_8684945772994747598[27] = 0; - out_8684945772994747598[28] = 0; - out_8684945772994747598[29] = 0; - out_8684945772994747598[30] = 0; - out_8684945772994747598[31] = 0; - out_8684945772994747598[32] = 0; - out_8684945772994747598[33] = 0; - out_8684945772994747598[34] = 0; - out_8684945772994747598[35] = 0; - out_8684945772994747598[36] = 0; - out_8684945772994747598[37] = 0; - out_8684945772994747598[38] = 0; - out_8684945772994747598[39] = 0; - out_8684945772994747598[40] = 0; - out_8684945772994747598[41] = 0; - out_8684945772994747598[42] = 0; - out_8684945772994747598[43] = 0; - out_8684945772994747598[44] = 1; - out_8684945772994747598[45] = 0; - out_8684945772994747598[46] = 0; - out_8684945772994747598[47] = 0; - out_8684945772994747598[48] = 0; - out_8684945772994747598[49] = 0; - out_8684945772994747598[50] = 0; - out_8684945772994747598[51] = 0; - out_8684945772994747598[52] = 0; - out_8684945772994747598[53] = 0; +void H_14(double *state, double *unused, double *out_5366562929692550959) { + out_5366562929692550959[0] = 0; + out_5366562929692550959[1] = 0; + out_5366562929692550959[2] = 0; + out_5366562929692550959[3] = 0; + out_5366562929692550959[4] = 0; + out_5366562929692550959[5] = 0; + out_5366562929692550959[6] = 1; + out_5366562929692550959[7] = 0; + out_5366562929692550959[8] = 0; + out_5366562929692550959[9] = 0; + out_5366562929692550959[10] = 0; + out_5366562929692550959[11] = 0; + out_5366562929692550959[12] = 0; + out_5366562929692550959[13] = 0; + out_5366562929692550959[14] = 0; + out_5366562929692550959[15] = 0; + out_5366562929692550959[16] = 0; + out_5366562929692550959[17] = 0; + out_5366562929692550959[18] = 0; + out_5366562929692550959[19] = 0; + out_5366562929692550959[20] = 0; + out_5366562929692550959[21] = 0; + out_5366562929692550959[22] = 0; + out_5366562929692550959[23] = 0; + out_5366562929692550959[24] = 0; + out_5366562929692550959[25] = 1; + out_5366562929692550959[26] = 0; + out_5366562929692550959[27] = 0; + out_5366562929692550959[28] = 0; + out_5366562929692550959[29] = 0; + out_5366562929692550959[30] = 0; + out_5366562929692550959[31] = 0; + out_5366562929692550959[32] = 0; + out_5366562929692550959[33] = 0; + out_5366562929692550959[34] = 0; + out_5366562929692550959[35] = 0; + out_5366562929692550959[36] = 0; + out_5366562929692550959[37] = 0; + out_5366562929692550959[38] = 0; + out_5366562929692550959[39] = 0; + out_5366562929692550959[40] = 0; + out_5366562929692550959[41] = 0; + out_5366562929692550959[42] = 0; + out_5366562929692550959[43] = 0; + out_5366562929692550959[44] = 1; + out_5366562929692550959[45] = 0; + out_5366562929692550959[46] = 0; + out_5366562929692550959[47] = 0; + out_5366562929692550959[48] = 0; + out_5366562929692550959[49] = 0; + out_5366562929692550959[50] = 0; + out_5366562929692550959[51] = 0; + out_5366562929692550959[52] = 0; + out_5366562929692550959[53] = 0; } #include #include @@ -1113,44 +1113,44 @@ void pose_update_13(double *in_x, double *in_P, double *in_z, double *in_R, doub void pose_update_14(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) { update<3, 3, 0>(in_x, in_P, h_14, H_14, NULL, in_z, in_R, in_ea, MAHA_THRESH_14); } -void pose_err_fun(double *nom_x, double *delta_x, double *out_3585092682791090136) { - err_fun(nom_x, delta_x, out_3585092682791090136); +void pose_err_fun(double *nom_x, double *delta_x, double *out_8879515811318903877) { + err_fun(nom_x, delta_x, out_8879515811318903877); } -void pose_inv_err_fun(double *nom_x, double *true_x, double *out_3602092163882833613) { - inv_err_fun(nom_x, true_x, out_3602092163882833613); +void pose_inv_err_fun(double *nom_x, double *true_x, double *out_5299248816140732451) { + inv_err_fun(nom_x, true_x, out_5299248816140732451); } -void pose_H_mod_fun(double *state, double *out_9072779523166268742) { - H_mod_fun(state, out_9072779523166268742); +void pose_H_mod_fun(double *state, double *out_4677544152144015683) { + H_mod_fun(state, out_4677544152144015683); } -void pose_f_fun(double *state, double dt, double *out_8675559756142309217) { - f_fun(state, dt, out_8675559756142309217); +void pose_f_fun(double *state, double dt, double *out_7013494318329414190) { + f_fun(state, dt, out_7013494318329414190); } -void pose_F_fun(double *state, double dt, double *out_4846751114242430980) { - F_fun(state, dt, out_4846751114242430980); +void pose_F_fun(double *state, double dt, double *out_1354267763168931680) { + F_fun(state, dt, out_1354267763168931680); } -void pose_h_4(double *state, double *unused, double *out_5930999592870125556) { - h_4(state, unused, out_5930999592870125556); +void pose_h_4(double *state, double *unused, double *out_4996940222577203074) { + h_4(state, unused, out_4996940222577203074); } -void pose_H_4(double *state, double *unused, double *out_5602157340699375302) { - H_4(state, unused, out_5602157340699375302); +void pose_H_4(double *state, double *unused, double *out_1403322073353066430) { + H_4(state, unused, out_1403322073353066430); } -void pose_h_10(double *state, double *unused, double *out_5557120776990141355) { - h_10(state, unused, out_5557120776990141355); +void pose_h_10(double *state, double *unused, double *out_4736471881593411299) { + h_10(state, unused, out_4736471881593411299); } -void pose_H_10(double *state, double *unused, double *out_1023238183635137507) { - H_10(state, unused, out_1023238183635137507); +void pose_H_10(double *state, double *unused, double *out_6592862647789865695) { + H_10(state, unused, out_6592862647789865695); } -void pose_h_13(double *state, double *unused, double *out_6353105533166408740) { - h_13(state, unused, out_6353105533166408740); +void pose_h_13(double *state, double *unused, double *out_4300313025089579851) { + h_13(state, unused, out_4300313025089579851); } -void pose_H_13(double *state, double *unused, double *out_2008473867617325627) { - H_13(state, unused, out_2008473867617325627); +void pose_H_13(double *state, double *unused, double *out_4615595898685399231) { + H_13(state, unused, out_4615595898685399231); } -void pose_h_14(double *state, double *unused, double *out_3322199193100514196) { - h_14(state, unused, out_3322199193100514196); +void pose_h_14(double *state, double *unused, double *out_4861809331317933851) { + h_14(state, unused, out_4861809331317933851); } -void pose_H_14(double *state, double *unused, double *out_8684945772994747598) { - H_14(state, unused, out_8684945772994747598); +void pose_H_14(double *state, double *unused, double *out_5366562929692550959) { + H_14(state, unused, out_5366562929692550959); } void pose_predict(double *in_x, double *in_P, double *in_Q, double dt) { predict(in_x, in_P, in_Q, dt); diff --git a/selfdrive/locationd/models/generated/pose.h b/selfdrive/locationd/models/generated/pose.h index 6bdec7a65..b2490ff21 100644 --- a/selfdrive/locationd/models/generated/pose.h +++ b/selfdrive/locationd/models/generated/pose.h @@ -5,18 +5,18 @@ void pose_update_4(double *in_x, double *in_P, double *in_z, double *in_R, doubl void pose_update_10(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); void pose_update_13(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); void pose_update_14(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea); -void pose_err_fun(double *nom_x, double *delta_x, double *out_3585092682791090136); -void pose_inv_err_fun(double *nom_x, double *true_x, double *out_3602092163882833613); -void pose_H_mod_fun(double *state, double *out_9072779523166268742); -void pose_f_fun(double *state, double dt, double *out_8675559756142309217); -void pose_F_fun(double *state, double dt, double *out_4846751114242430980); -void pose_h_4(double *state, double *unused, double *out_5930999592870125556); -void pose_H_4(double *state, double *unused, double *out_5602157340699375302); -void pose_h_10(double *state, double *unused, double *out_5557120776990141355); -void pose_H_10(double *state, double *unused, double *out_1023238183635137507); -void pose_h_13(double *state, double *unused, double *out_6353105533166408740); -void pose_H_13(double *state, double *unused, double *out_2008473867617325627); -void pose_h_14(double *state, double *unused, double *out_3322199193100514196); -void pose_H_14(double *state, double *unused, double *out_8684945772994747598); +void pose_err_fun(double *nom_x, double *delta_x, double *out_8879515811318903877); +void pose_inv_err_fun(double *nom_x, double *true_x, double *out_5299248816140732451); +void pose_H_mod_fun(double *state, double *out_4677544152144015683); +void pose_f_fun(double *state, double dt, double *out_7013494318329414190); +void pose_F_fun(double *state, double dt, double *out_1354267763168931680); +void pose_h_4(double *state, double *unused, double *out_4996940222577203074); +void pose_H_4(double *state, double *unused, double *out_1403322073353066430); +void pose_h_10(double *state, double *unused, double *out_4736471881593411299); +void pose_H_10(double *state, double *unused, double *out_6592862647789865695); +void pose_h_13(double *state, double *unused, double *out_4300313025089579851); +void pose_H_13(double *state, double *unused, double *out_4615595898685399231); +void pose_h_14(double *state, double *unused, double *out_4861809331317933851); +void pose_H_14(double *state, double *unused, double *out_5366562929692550959); void pose_predict(double *in_x, double *in_P, double *in_Q, double dt); } \ No newline at end of file diff --git a/selfdrive/pandad/pandad b/selfdrive/pandad/pandad index a80ff970d..1ab514972 100755 Binary files a/selfdrive/pandad/pandad and b/selfdrive/pandad/pandad differ diff --git a/selfdrive/ui/translations/main_uk.qm b/selfdrive/ui/translations/main_uk.qm index 0dc308cea..1a915abcd 100644 Binary files a/selfdrive/ui/translations/main_uk.qm and b/selfdrive/ui/translations/main_uk.qm differ diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui index 4f125e514..b9d541838 100755 Binary files a/selfdrive/ui/ui and b/selfdrive/ui/ui differ diff --git a/system/camerad/camerad b/system/camerad/camerad index 41223dba2..68b5608ea 100755 Binary files a/system/camerad/camerad and b/system/camerad/camerad differ diff --git a/system/loggerd/bootlog b/system/loggerd/bootlog index f90afbfcc..df49f6b15 100755 Binary files a/system/loggerd/bootlog and b/system/loggerd/bootlog differ diff --git a/system/loggerd/encoderd b/system/loggerd/encoderd index 7f81bc592..d70159ba3 100755 Binary files a/system/loggerd/encoderd and b/system/loggerd/encoderd differ diff --git a/system/loggerd/loggerd b/system/loggerd/loggerd index f2dff39d4..da31c0c08 100755 Binary files a/system/loggerd/loggerd and b/system/loggerd/loggerd differ diff --git a/yolo26n-cls.pt b/yolo26n-cls.pt new file mode 100644 index 000000000..635b0170a Binary files /dev/null and b/yolo26n-cls.pt differ