X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4f15663c34447bed92582e01f96ae8ba5841fcd..bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed:/src/xbt/automaton/automaton.c

diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c
index 8824c52df9..e3abf53971 100644
--- a/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@ -1,6 +1,7 @@
 /* automaton - representation of büchi automaton */
 
-/* Copyright (c) 2011-2013. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2011-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,26 +12,26 @@
 xbt_automaton_t xbt_automaton_new(){
   xbt_automaton_t automaton = NULL;
   automaton = xbt_new0(struct xbt_automaton, 1);
-  automaton->states = xbt_dynar_new(sizeof(xbt_state_t), xbt_state_free_voidp);
-  automaton->transitions = xbt_dynar_new(sizeof(xbt_transition_t), xbt_transition_free_voidp);
-  automaton->propositional_symbols = xbt_dynar_new(sizeof(xbt_propositional_symbol_t), xbt_propositional_symbol_free_voidp);
+  automaton->states = xbt_dynar_new(sizeof(xbt_automaton_state_t), xbt_automaton_state_free_voidp);
+  automaton->transitions = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp);
+  automaton->propositional_symbols = xbt_dynar_new(sizeof(xbt_automaton_propositional_symbol_t), xbt_automaton_propositional_symbol_free_voidp);
   return automaton;
 }
 
-xbt_state_t xbt_automaton_new_state(xbt_automaton_t a, int type, char* id){
-  xbt_state_t state = NULL;
-  state = xbt_new0(struct xbt_state, 1);
+xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* id){
+  xbt_automaton_state_t state = NULL;
+  state = xbt_new0(struct xbt_automaton_state, 1);
   state->type = type;
   state->id = strdup(id);
-  state->in = xbt_dynar_new(sizeof(xbt_transition_t), xbt_transition_free_voidp);
-  state->out = xbt_dynar_new(sizeof(xbt_transition_t), xbt_transition_free_voidp); 
+  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);
   return state;
 }
 
-xbt_transition_t xbt_automaton_new_transition(xbt_automaton_t a, xbt_state_t src, xbt_state_t dst, xbt_exp_label_t label){
-  xbt_transition_t transition = NULL;
-  transition = xbt_new0(struct xbt_transition, 1);
+xbt_automaton_transition_t xbt_automaton_transition_new(xbt_automaton_t a, xbt_automaton_state_t src, xbt_automaton_state_t dst, xbt_automaton_exp_label_t label){
+  xbt_automaton_transition_t transition = NULL;
+  transition = xbt_new0(struct xbt_automaton_transition, 1);
   if(src != NULL){
     xbt_dynar_push(src->out, &transition);
     transition->src = src;
@@ -44,30 +45,30 @@ xbt_transition_t xbt_automaton_new_transition(xbt_automaton_t a, xbt_state_t src
   return transition;
 }
 
-xbt_exp_label_t xbt_automaton_new_label(int type, ...){
-  xbt_exp_label_t label = NULL;
-  label = xbt_new0(struct xbt_exp_label, 1);
+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;
 
   va_list ap;
   va_start(ap, type);
   switch(type){
   case 0 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
+    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);
     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;
   }
   case 1 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
+    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);
     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;
   }
   case 2 : {
-    xbt_exp_label_t exp_not = va_arg(ap, xbt_exp_label_t);
+    xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
     label->u.exp_not = exp_not;
     break;
   }
@@ -90,8 +91,8 @@ xbt_dynar_t xbt_automaton_get_transitions(xbt_automaton_t a){
   return a->transitions;
 }
 
-xbt_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_state_t src, xbt_state_t dst){
-  xbt_transition_t transition;
+xbt_automaton_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_automaton_state_t src, xbt_automaton_state_t dst){
+  xbt_automaton_transition_t transition;
   unsigned int cursor;
   xbt_dynar_foreach(src->out, cursor, transition){
     if((transition->src == src) && (transition->dst == dst))
@@ -100,34 +101,34 @@ xbt_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_state_t src
   return NULL;
 }
 
-xbt_state_t xbt_automaton_transition_get_source(xbt_transition_t t){
+xbt_automaton_state_t xbt_automaton_transition_get_source(xbt_automaton_transition_t t){
   return t->src;
 }
 
-xbt_state_t xbt_automaton_transition_get_destination(xbt_transition_t t){
+xbt_automaton_state_t xbt_automaton_transition_get_destination(xbt_automaton_transition_t t){
   return t->dst;
 }
 
-void xbt_automaton_transition_set_source(xbt_transition_t t, xbt_state_t src){
+void xbt_automaton_transition_set_source(xbt_automaton_transition_t t, xbt_automaton_state_t src){
   t->src = src;
   xbt_dynar_push(src->out,&t);
 }
 
-void xbt_automaton_transition_set_destination(xbt_transition_t t, xbt_state_t dst){
+void xbt_automaton_transition_set_destination(xbt_automaton_transition_t t, xbt_automaton_state_t dst){
   t->dst = dst;
   xbt_dynar_push(dst->in,&t);
 }
 
-xbt_dynar_t xbt_automaton_state_get_out_transitions(xbt_state_t s){
+xbt_dynar_t xbt_automaton_state_get_out_transitions(xbt_automaton_state_t s){
   return s->out;
 }
 
-xbt_dynar_t xbt_automaton_state_get_in_transitions(xbt_state_t s){
+xbt_dynar_t xbt_automaton_state_get_in_transitions(xbt_automaton_state_t s){
   return s->in;
 }
 
-xbt_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
-  xbt_state_t state = NULL;
+xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
+  xbt_automaton_state_t state = NULL;
   unsigned int cursor = 0;
   xbt_dynar_foreach(a->states, cursor, state){
    if(strcmp(state->id, id)==0)
@@ -136,9 +137,9 @@ xbt_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
   return NULL;
 }
 
-void  xbt_automaton_display(xbt_automaton_t a){
+void xbt_automaton_display(xbt_automaton_t a){
   unsigned int cursor = 0;
-  xbt_state_t state = NULL;
+  xbt_automaton_state_t state = NULL;
 
   printf("\n\nEtat courant : %s\n", a->current_state->id);
 
@@ -150,36 +151,36 @@ void  xbt_automaton_display(xbt_automaton_t a){
   }
 
   cursor=0;
-  xbt_transition_t transition = NULL;
+  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 :");
-    xbt_automaton_display_exp(transition->label);
+    xbt_automaton_exp_label_display(transition->label);
     printf(", %s -> %s\n", transition->src->id, transition->dst->id);
   }
 }
 
-void xbt_automaton_display_exp(xbt_exp_label_t label){
+void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){
 
   switch(label->type){
   case 0 :
     printf("(");
-    xbt_automaton_display_exp(label->u.or_and.left_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.left_exp);
     printf(" || ");
-    xbt_automaton_display_exp(label->u.or_and.right_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.right_exp);
     printf(")");
     break;
   case 1 : 
     printf("(");
-    xbt_automaton_display_exp(label->u.or_and.left_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.left_exp);
     printf(" && ");
-    xbt_automaton_display_exp(label->u.or_and.right_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.right_exp);
     printf(")");
     break;
   case 2 : 
     printf("(!");
-    xbt_automaton_display_exp(label->u.exp_not);
+    xbt_automaton_exp_label_display(label->u.exp_not);
     printf(")");
     break;
   case 3 :
@@ -192,20 +193,20 @@ void xbt_automaton_display_exp(xbt_exp_label_t label){
 
 }
 
-xbt_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
+xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
   return a->current_state;
 }
 
-xbt_propositional_symbol_t xbt_new_propositional_symbol(xbt_automaton_t a, const char* id, void* fct){
-  xbt_propositional_symbol_t prop_symb = NULL;
-  prop_symb = xbt_new0(struct xbt_propositional_symbol, 1);
+xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, void* fct){
+  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->function = fct;
   xbt_dynar_push(a->propositional_symbols, &prop_symb);
   return prop_symb;
 }
 
-int automaton_state_compare(xbt_state_t s1, xbt_state_t s2){
+int xbt_automaton_state_compare(xbt_automaton_state_t s1, xbt_automaton_state_t s2){
 
   /* single id for each state, id and type sufficient for comparison*/
 
@@ -219,22 +220,22 @@ int automaton_state_compare(xbt_state_t s1, xbt_state_t s2){
 
 }
 
-int automaton_transition_compare(const void *t1, const void *t2){
+int xbt_automaton_transition_compare(const void *t1, const void *t2){
 
-  if(automaton_state_compare(((xbt_transition_t)t1)->src, ((xbt_transition_t)t2)->src))
+  if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->src, ((xbt_automaton_transition_t)t2)->src))
     return 1;
   
-  if(automaton_state_compare(((xbt_transition_t)t1)->dst, ((xbt_transition_t)t2)->dst))
+  if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->dst, ((xbt_automaton_transition_t)t2)->dst))
     return 1;
 
-  if(automaton_label_transition_compare(((xbt_transition_t)t1)->label,((xbt_transition_t)t2)->label))
+  if(xbt_automaton_exp_label_compare(((xbt_automaton_transition_t)t1)->label,((xbt_automaton_transition_t)t2)->label))
     return 1;
 
   return 0;
   
 }
 
-int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
+int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_exp_label_t l2){
 
   if(l1->type != l2->type)
     return 1;
@@ -243,14 +244,14 @@ int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
 
   case 0 : // OR 
   case 1 : // AND
-    if(automaton_label_transition_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
+    if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
       return 1;
     else
-      return automaton_label_transition_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
+      return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
     break;
 
   case 2 : // NOT
-    return automaton_label_transition_compare(l1->u.exp_not, l2->u.exp_not);
+    return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
     break;
 
   case 3 : // predicat
@@ -270,7 +271,7 @@ int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
 }
 
 
-int propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
+int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
 
   int *iptr1, *iptr2;
   unsigned int cursor;
@@ -288,11 +289,11 @@ int propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
 
 /************ Free functions ****************/
 
-static void xbt_transition_free(xbt_transition_t t);
-static void xbt_exp_label_free(xbt_exp_label_t e);
-static void xbt_propositional_symbol_free(xbt_propositional_symbol_t ps);
+static void xbt_automaton_transition_free(xbt_automaton_transition_t t);
+static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e);
+static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps);
 
-void xbt_state_free(xbt_state_t s){
+void xbt_automaton_state_free(xbt_automaton_state_t s){
   if(s){
     xbt_free(s->id);
     xbt_dynar_free(&(s->in));
@@ -302,32 +303,32 @@ void xbt_state_free(xbt_state_t s){
   }
 }
 
-void xbt_state_free_voidp(void *s){
-  xbt_state_free((xbt_state_t) * (void **) s);
+void xbt_automaton_state_free_voidp(void *s){
+  xbt_automaton_state_free((xbt_automaton_state_t) * (void **) s);
 }
 
-static void xbt_transition_free(xbt_transition_t t){
+static void xbt_automaton_transition_free(xbt_automaton_transition_t t){
   if(t){
-    xbt_exp_label_free(t->label);
+    xbt_automaton_exp_label_free(t->label);
     xbt_free(t);
     t = NULL;
   }
 }
 
-void xbt_transition_free_voidp(void *t){
-  xbt_transition_free((xbt_transition_t) * (void **) t);
+void xbt_automaton_transition_free_voidp(void *t){
+  xbt_automaton_transition_free((xbt_automaton_transition_t) * (void **) t);
 }
 
-static void xbt_exp_label_free(xbt_exp_label_t e){
+static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e){
   if(e){
     switch(e->type){
     case 0:
     case 1:
-      xbt_exp_label_free(e->u.or_and.left_exp);
-      xbt_exp_label_free(e->u.or_and.right_exp);
+      xbt_automaton_exp_label_free(e->u.or_and.left_exp);
+      xbt_automaton_exp_label_free(e->u.or_and.right_exp);
       break;
     case 2:
-      xbt_exp_label_free(e->u.exp_not);
+      xbt_automaton_exp_label_free(e->u.exp_not);
       break;
     case 3:
       xbt_free(e->u.predicat);
@@ -340,11 +341,11 @@ static void xbt_exp_label_free(xbt_exp_label_t e){
   }
 }
 
-void xbt_exp_label_free_voidp(void *e){
-  xbt_exp_label_free((xbt_exp_label_t) * (void **) e);
+void xbt_automaton_exp_label_free_voidp(void *e){
+  xbt_automaton_exp_label_free((xbt_automaton_exp_label_t) * (void **) e);
 }
 
-static void xbt_propositional_symbol_free(xbt_propositional_symbol_t ps){
+static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps){
   if(ps){
     xbt_free(ps->pred);
     xbt_free(ps);
@@ -352,8 +353,8 @@ static void xbt_propositional_symbol_free(xbt_propositional_symbol_t ps){
   }
 }
 
-void xbt_propositional_symbol_free_voidp(void *ps){
-  xbt_propositional_symbol_free((xbt_propositional_symbol_t) * (void **) ps);
+void xbt_automaton_propositional_symbol_free_voidp(void *ps){
+  xbt_automaton_propositional_symbol_free((xbt_automaton_propositional_symbol_t) * (void **) ps);
 }
 
 void xbt_automaton_free(xbt_automaton_t a){
@@ -361,7 +362,7 @@ void xbt_automaton_free(xbt_automaton_t a){
     xbt_dynar_free(&(a->propositional_symbols));
     xbt_dynar_free(&(a->transitions));
     xbt_dynar_free(&(a->states));
-    xbt_state_free(a->current_state);
+    xbt_automaton_state_free(a->current_state);
     xbt_free(a);
     a = NULL;
   }