X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c12a132ca10eefd1d566e489e837e459db4d979..6d1fc1c31cb2152b6d20742081118524dbb78d14:/src/xbt/automaton/automaton.c diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c index a961720fde..39ec9726db 100644 --- a/src/xbt/automaton/automaton.c +++ b/src/xbt/automaton/automaton.c @@ -1,6 +1,6 @@ /* automaton - representation of büchi automaton */ -/* Copyright (c) 2011-2014. The SimGrid Team. +/* Copyright (c) 2011-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -16,11 +16,11 @@ struct xbt_automaton_propositional_symbol{ /** Additional data for the callback. Alternatively it can be used as a pointer to the data. */ void* data; - //** Optional callback used to free the data field */ + /** Optional callback used to free the data field */ void (*free_function)(void*); }; -xbt_automaton_t xbt_automaton_new(){ +xbt_automaton_t xbt_automaton_new(void){ xbt_automaton_t automaton = NULL; automaton = xbt_new0(struct xbt_automaton, 1); automaton->states = xbt_dynar_new(sizeof(xbt_automaton_state_t), xbt_automaton_state_free_voidp); @@ -33,7 +33,7 @@ xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* xbt_automaton_state_t state = NULL; state = xbt_new0(struct xbt_automaton_state, 1); state->type = type; - state->id = strdup(id); + state->id = xbt_strdup(id); state->in = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp); state->out = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp); xbt_dynar_push(a->states, &state); @@ -60,40 +60,38 @@ xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){ xbt_automaton_exp_label_t label = NULL; label = xbt_new0(struct xbt_automaton_exp_label, 1); label->type = type; - + xbt_automaton_exp_label_t left; + xbt_automaton_exp_label_t right; + xbt_automaton_exp_label_t exp_not; + char *p; va_list ap; va_start(ap, type); switch(type){ - case 0 : { - xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t); - xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t); + case 0 : + left = va_arg(ap, xbt_automaton_exp_label_t); + right = va_arg(ap, xbt_automaton_exp_label_t); label->u.or_and.left_exp = left; label->u.or_and.right_exp = right; break; - } - case 1 : { - xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t); - xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t); + case 1 : + left = va_arg(ap, xbt_automaton_exp_label_t); + right = va_arg(ap, xbt_automaton_exp_label_t); label->u.or_and.left_exp = left; label->u.or_and.right_exp = right; break; - } - case 2 : { - xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t); + case 2 : + exp_not = va_arg(ap, xbt_automaton_exp_label_t); label->u.exp_not = exp_not; break; - } - case 3 :{ - char* p = va_arg(ap, char*); - label->u.predicat = strdup(p); + case 3 : + p = va_arg(ap, char*); + label->u.predicat = xbt_strdup(p); break; } - } va_end(ap); return label; } - xbt_dynar_t xbt_automaton_get_states(xbt_automaton_t a){ return a->states; } @@ -149,59 +147,53 @@ xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){ } void xbt_automaton_display(xbt_automaton_t a){ - unsigned int cursor = 0; + unsigned int cursor; xbt_automaton_state_t state = NULL; - printf("\n\nEtat courant : %s\n", a->current_state->id); + printf("\n\nCurrent state: %s\n", a->current_state->id); - printf("\nListe des états : %lu\n\n", xbt_dynar_length(a->states)); - - - xbt_dynar_foreach(a->states, cursor, state){ - printf("ID : %s, type : %d\n", state->id, state->type); - } + printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states)); + + xbt_dynar_foreach(a->states, cursor, state) + printf("ID: %s, type: %d\n", state->id, state->type); + + xbt_automaton_transition_t transition; + printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions)); - cursor=0; - xbt_automaton_transition_t transition = NULL; - printf("\nListe des transitions : %lu\n\n", xbt_dynar_length(a->transitions)); - xbt_dynar_foreach(a->transitions, cursor, transition){ - printf("label :"); + printf("label:"); xbt_automaton_exp_label_display(transition->label); printf(", %s -> %s\n", transition->src->id, transition->dst->id); } } void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){ - + printf("("); switch(label->type){ - case 0 : - printf("("); - xbt_automaton_exp_label_display(label->u.or_and.left_exp); - printf(" || "); - xbt_automaton_exp_label_display(label->u.or_and.right_exp); - printf(")"); - break; - case 1 : - printf("("); - xbt_automaton_exp_label_display(label->u.or_and.left_exp); - printf(" && "); - xbt_automaton_exp_label_display(label->u.or_and.right_exp); - printf(")"); - break; - case 2 : - printf("(!"); - xbt_automaton_exp_label_display(label->u.exp_not); - printf(")"); - break; - case 3 : - printf("(%s)",label->u.predicat); - break; - case 4 : - printf("(1)"); - break; + case 0: + xbt_automaton_exp_label_display(label->u.or_and.left_exp); + printf(" || "); + xbt_automaton_exp_label_display(label->u.or_and.right_exp); + break; + case 1: + xbt_automaton_exp_label_display(label->u.or_and.left_exp); + printf(" && "); + xbt_automaton_exp_label_display(label->u.or_and.right_exp); + break; + case 2: + printf("!"); + xbt_automaton_exp_label_display(label->u.exp_not); + break; + case 3: + printf("%s", label->u.predicat); + break; + case 4: + printf("1"); + break; + default: + break; } - + printf(")"); } xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){ @@ -216,8 +208,8 @@ static int call_simple_function(void* function) xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, int(*fct)(void)){ xbt_automaton_propositional_symbol_t prop_symb = NULL; prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); - prop_symb->pred = strdup(id); - prop_symb->callback = call_simple_function; + prop_symb->pred = xbt_strdup(id); + prop_symb->callback = &call_simple_function; prop_symb->data = fct; prop_symb->free_function = NULL; xbt_dynar_push(a->propositional_symbols, &prop_symb); @@ -228,7 +220,7 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym { xbt_automaton_propositional_symbol_t prop_symb = NULL; prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); - prop_symb->pred = strdup(id); + prop_symb->pred = xbt_strdup(id); prop_symb->callback = NULL; prop_symb->data = value; prop_symb->free_function = NULL; @@ -243,7 +235,7 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym { xbt_automaton_propositional_symbol_t prop_symb = NULL; prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); - prop_symb->pred = strdup(id); + prop_symb->pred = xbt_strdup(id); prop_symb->callback = callback; prop_symb->data = data; prop_symb->free_function = free_function; @@ -309,7 +301,6 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_ return 1; switch(l1->type){ - case 0 : // OR case 1 : // AND if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp)) @@ -317,37 +308,27 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_ else return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp); break; - case 2 : // NOT return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not); break; - case 3 : // predicat return (strcmp(l1->u.predicat, l2->u.predicat)); break; - case 4 : // 1 return 0; break; - default : return -1; break; - } - } - int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){ - - int *iptr1, *iptr2; - unsigned int cursor; unsigned int nb_elem = xbt_dynar_length(s1); - for(cursor=0;cursorid); xbt_dynar_free(&(s->in)); xbt_dynar_free(&(s->out)); xbt_free(s); - s = NULL; } }