/[ascend]/trunk/base/generic/solver/rel.c
ViewVC logotype

Diff of /trunk/base/generic/solver/rel.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 770 by johnpye, Fri Jul 14 03:35:16 2006 UTC revision 771 by johnpye, Fri Jul 14 04:31:54 2006 UTC
# Line 143  struct rel_relation *rel_create(SlvBacke Line 143  struct rel_relation *rel_create(SlvBacke
143      /* get the 'struct relation' object for this relation */      /* get the 'struct relation' object for this relation */
144      instance_relation = GetInstanceRelation(IPTR(instance),&ctype);      instance_relation = GetInstanceRelation(IPTR(instance),&ctype);
145    
146      CONSOLE_DEBUG("The 'relation' struct is at %p",instance_relation);      REL_DEBUG("The 'relation' struct is at %p",instance_relation);
147    
148      REL_DEBUG("Instance %p --> RELATION = %p",IPTR(instance),instance_relation);      REL_DEBUG("Instance %p --> RELATION = %p",IPTR(instance),instance_relation);
149      switch (ctype) {      switch (ctype) {
# Line 157  struct rel_relation *rel_create(SlvBacke Line 157  struct rel_relation *rel_create(SlvBacke
157              newrel->type = e_rel_glassbox;              newrel->type = e_rel_glassbox;
158              break;              break;
159          case e_blackbox:          case e_blackbox:
160              CONSOLE_DEBUG("Blackbox...");              REL_DEBUG("Blackbox...");
161              newrel->type = e_rel_blackbox;              newrel->type = e_rel_blackbox;
162              ext = BlackBoxExtCall(instance_relation);              ext = BlackBoxExtCall(instance_relation);
163    
164              CONSOLE_DEBUG("Subject instance at %p",ExternalCallVarInstance(ext));              REL_DEBUG("Subject instance at %p",ExternalCallVarInstance(ext));
165              REL_DEBUG("Subject instance type '%s'",instance_typename(ExternalCallVarInstance(ext)));              REL_DEBUG("Subject instance type '%s'",instance_typename(ExternalCallVarInstance(ext)));
166    
167              if(ext){              if(ext){
168                  CONSOLE_DEBUG("REL_EXTNODE FOUND, ATTACHING REL_RELATION TO EXT at %p",ext);                  REL_DEBUG("REL_EXTNODE FOUND, ATTACHING REL_RELATION TO EXT at %p",ext);
169                  newrel = rel_create_extnode(newrel,ext);                  newrel = rel_create_extnode(newrel,ext);
170              }else{              }else{
171                  CONSOLE_DEBUG("SET NODEINFO TO NULL IN NEWREL AT %p",newrel);                  REL_DEBUG("SET NODEINFO TO NULL IN NEWREL AT %p",newrel);
172                  newrel->nodeinfo = NULL;                  newrel->nodeinfo = NULL;
173              }              }
174    
# Line 209  static struct var_variable *rel_instance Line 209  static struct var_variable *rel_instance
209      incid = rel_incidence_list_to_modify(rel);      incid = rel_incidence_list_to_modify(rel);
210      nincid = rel_n_incidences(rel);      nincid = rel_n_incidences(rel);
211    
212      CONSOLE_DEBUG("Looking for var in list of %d incident on rel %p",nincid,rel);      REL_DEBUG("Looking for var in list of %d incident on rel %p",nincid,rel);
213    
214      var = NULL;      var = NULL;
215      for(j=0;j<nincid;++j){      for(j=0;j<nincid;++j){

Legend:
Removed from v.770  
changed lines
  Added in v.771

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22