-/* Copyright (c) 2012-2013. The SimGrid Team.
+/* Copyright (c) 2012-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
int num1, num2;
if(_sg_mc_property_file && _sg_mc_property_file[0] != '\0'){ /* Liveness MC */
- s1 = ((mc_pair_t)state1)->graph_state->system_state;
- s2 = ((mc_pair_t)state2)->graph_state->system_state;
- num1 = ((mc_pair_t)state1)->num;
- num2 = ((mc_pair_t)state2)->num;
+ s1 = ((mc_visited_pair_t)state1)->graph_state->system_state;
+ s2 = ((mc_visited_pair_t)state2)->graph_state->system_state;
+ num1 = ((mc_visited_pair_t)state1)->num;
+ num2 = ((mc_visited_pair_t)state2)->num;
/* Firstly compare automaton state */
- if(xbt_automaton_state_compare(((mc_pair_t)state1)->automaton_state, ((mc_pair_t)state2)->automaton_state) != 0)
+ /*if(xbt_automaton_state_compare(((mc_pair_t)state1)->automaton_state, ((mc_pair_t)state2)->automaton_state) != 0)
return 1;
if(xbt_automaton_propositional_symbols_compare_value(((mc_pair_t)state1)->atomic_propositions, ((mc_pair_t)state2)->atomic_propositions) != 0)
- return 1;
+ return 1;*/
}else{ /* Safety MC */
s1 = ((mc_visited_state_t)state1)->system_state;
s2 = ((mc_visited_state_t)state2)->system_state;
#endif
/* Compare heap */
- if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data) > 0){
+ if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, mc_variables_type_libsimgrid, mc_variables_type_binary) > 0){
#ifdef MC_DEBUG
xbt_os_walltimer_stop(timer);