int propositional_symbols_compare_value(const void *s1, const void *s2){
- return (!((int)s1 == (int)s2));
+ const int *ps1 = s1;
+ const int *ps2 = s2;
+ printf("ps 1 = %d, ps2 = %d", *ps1, *ps2);
+
+ return (!(*ps1 == *ps2));
}
state_dst = xbt_automaton_state_exists(automaton, id_state);
xbt_state_t state_src = xbt_automaton_state_exists(automaton, state_id_src);
- xbt_transition_t trans = NULL;
- trans = xbt_automaton_new_transition(automaton, state_src, state_dst, label);
+ //xbt_transition_t trans = NULL;
+ xbt_automaton_new_transition(automaton, state_src, state_dst, label);
}
init();
yyparse();
automaton = get_automaton();
- xbt_propositional_symbol_t ps = xbt_new_propositional_symbol(automaton,"p", &predP);
- ps = xbt_new_propositional_symbol(automaton,"q", &predQ);
+ xbt_new_propositional_symbol(automaton,"p", &predP);
+ xbt_new_propositional_symbol(automaton,"q", &predQ);
//display_automaton();
init();
yyparse();
automaton = get_automaton();
- xbt_propositional_symbol_t ps = xbt_new_propositional_symbol(automaton,"p", &predP);
- ps = xbt_new_propositional_symbol(automaton,"q", &predQ);
+ xbt_new_propositional_symbol(automaton,"p", &predP);
+ xbt_new_propositional_symbol(automaton,"q", &predQ);
MSG_global_init(&argc, argv);
MSG_create_environment("../msg_platform.xml");
init();
yyparse();
automaton = get_automaton();
- xbt_propositional_symbol_t ps = xbt_new_propositional_symbol(automaton,"r", &predR);
- ps = xbt_new_propositional_symbol(automaton,"e", &predE);
- ps = xbt_new_propositional_symbol(automaton,"d", &predD);
+ xbt_new_propositional_symbol(automaton,"r", &predR);
+ xbt_new_propositional_symbol(automaton,"e", &predE);
+ xbt_new_propositional_symbol(automaton,"d", &predD);
//display_automaton();
xbt_propositional_symbol_t ps = NULL;
xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
int (*f)() = ps->function;
- const int res = (*f)();
+ int res = (*f)();
xbt_dynar_push(pair->prop_ato, &res);
}
mc_pair_reached_t pair = NULL;
pair = xbt_new0(s_mc_pair_reached_t, 1);
pair->automaton_state = a->current_state;
- pair->prop_ato = xbt_dynar_new(sizeof(const int), NULL);
+ pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
pair->system_state = s;
/* Get values of propositional symbols */
const int *ps2 = s2;
printf("ps 1 = %d, ps2 = %d", *ps1, *ps2);
- //return (!(*ps1 == *ps2));
- return 0;
+ return (!(*ps1 == *ps2));
}
state_dst = xbt_automaton_state_exists(automaton, id_state);
xbt_state_t state_src = xbt_automaton_state_exists(automaton, state_id_src);
- xbt_transition_t trans = NULL;
- trans = xbt_automaton_new_transition(automaton, state_src, state_dst, label);
+ //xbt_transition_t trans = NULL;
+ xbt_automaton_new_transition(automaton, state_src, state_dst, label);
}