From e59bc82b00517da8c6a6ef6dbf368ce8ffcac850 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Thu, 14 Jul 2016 14:58:30 -0300 Subject: [PATCH] Update code regarding recent API changes on Soletta Signed-off-by: Bruno Dilly --- sml/common/src/sml_cache.c | 6 +++--- sml/sml_ann/src/sml_ann_variable_list.c | 2 +- soletta_module/machine_learning/machine_learning.c | 14 +++++++------- soletta_module/sml_garden/sml_garden.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sml/common/src/sml_cache.c b/sml/common/src/sml_cache.c index 771be4e..0a106cf 100644 --- a/sml/common/src/sml_cache.c +++ b/sml/common/src/sml_cache.c @@ -69,7 +69,7 @@ sml_cache_set_max_size(struct sml_cache *cache, uint16_t max_elements) cache->max_elements = max_elements; while (sol_ptr_vector_get_len(&cache->elements) > max_elements) { - to_del = sol_ptr_vector_take(&cache->elements, 0); + to_del = sol_ptr_vector_steal(&cache->elements, 0); if (!to_del) { sml_critical("Could not remove an element from the cache!"); return false; @@ -104,7 +104,7 @@ sml_cache_put(struct sml_cache *cache, void *data) void *to_del; if (cache->max_elements && count == cache->max_elements) { - to_del = sol_ptr_vector_take(&cache->elements, 0); + to_del = sol_ptr_vector_steal(&cache->elements, 0); if (!to_del) { sml_critical("Could not remove the oldest element in the cache"); return false; @@ -188,7 +188,7 @@ sml_cache_remove_by_id(struct sml_cache *cache, uint16_t elem) { void *to_del; - to_del = sol_ptr_vector_take(&cache->elements, elem); + to_del = sol_ptr_vector_steal(&cache->elements, elem); if (!to_del) { sml_critical("Could not remove the oldest element in the cache"); return false; diff --git a/sml/sml_ann/src/sml_ann_variable_list.c b/sml/sml_ann/src/sml_ann_variable_list.c index 418b1b2..185a179 100644 --- a/sml/sml_ann/src/sml_ann_variable_list.c +++ b/sml/sml_ann/src/sml_ann_variable_list.c @@ -294,7 +294,7 @@ sml_ann_variable_list_remove(struct sml_variables_list *list, uint16_t index) { struct sml_variables_list_impl *impl = (struct sml_variables_list_impl *)list; - struct sml_variable *var = sol_ptr_vector_take(&impl->variables, index); + struct sml_variable *var = sol_ptr_vector_steal(&impl->variables, index); if (!var) { sml_critical("Could not remove the index %d", index); diff --git a/soletta_module/machine_learning/machine_learning.c b/soletta_module/machine_learning/machine_learning.c index 990cc8d..a7a5f76 100644 --- a/soletta_module/machine_learning/machine_learning.c +++ b/soletta_module/machine_learning/machine_learning.c @@ -759,8 +759,8 @@ input_var_process(struct sol_flow_node *node, void *data, uint16_t port, return -EINVAL; } - if ((!sol_util_double_equal(input_var->base.value.min, value.min)) || - (!sol_util_double_equal(input_var->base.value.max, value.max))) + if ((!sol_util_double_eq(input_var->base.value.min, value.min)) || + (!sol_util_double_eq(input_var->base.value.max, value.max))) input_var->base.range_changed = true; input_var->base.value = value; pthread_mutex_unlock(&mdata->read_lock); @@ -803,8 +803,8 @@ output_var_process(struct sol_flow_node *node, void *data, uint16_t port, } } - if ((!sol_util_double_equal(output_var->base.value.min, value.min)) || - (!sol_util_double_equal(output_var->base.value.max, value.max))) + if ((!sol_util_double_eq(output_var->base.value.min, value.min)) || + (!sol_util_double_eq(output_var->base.value.max, value.max))) output_var->base.range_changed = true; output_var->base.value = value; output_var->predicted_value = NAN; @@ -1285,8 +1285,8 @@ machine_learning_sync_update_variables(struct machine_learning_sync_data *mdata, if (!sml_variable_get_range(mdata->base.sml, var, &min, &max)) return -EINVAL; - if ((!sol_util_double_equal(min, val->min)) || - (!sol_util_double_equal(max, val->max))) { + if ((!sol_util_double_eq(min, val->min)) || + (!sol_util_double_eq(max, val->max))) { width = fmax((val->max - val->min + 1) / mdata->base.number_of_terms, val->step); @@ -1872,7 +1872,7 @@ learn_disabled_process(struct sol_flow_node *node, void *data, uint16_t port, bool disabled; int r; - r = sol_flow_packet_get_boolean(packet, &disabled); + r = sol_flow_packet_get_bool(packet, &disabled); SOL_INT_CHECK(r, < 0, r); if (mdata->learn_disabled == disabled) diff --git a/soletta_module/sml_garden/sml_garden.c b/soletta_module/sml_garden/sml_garden.c index 4f82cff..c654f8b 100644 --- a/soletta_module/sml_garden/sml_garden.c +++ b/soletta_module/sml_garden/sml_garden.c @@ -139,7 +139,7 @@ engine_state_process(struct sol_flow_node *node, void *data, struct sml_garden_data *sdata = data; time_t now = time(NULL); - r = sol_flow_packet_get_boolean(packet, &engine_is_on); + r = sol_flow_packet_get_bool(packet, &engine_is_on); SOL_INT_CHECK(r, < 0, r); if (engine_is_on)