[wsmx-commits] components/discovery/src/main/org/deri/wsmx/discovery/caching SDCGraphManager.java, 1.6, 1.7 SDCGraphCreator.java, 1.5, 1.6

[Michael S. <mst...@us...>]

Update of /cvsroot/wsmx/components/discovery/src/main/org/deri/wsmx/discovery/caching
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7932/discovery/src/main/org/deri/wsmx/discovery/caching

Modified Files:
	SDCGraphManager.java SDCGraphCreator.java 
Log Message:
corrected the i-arc resolution and the underlying management (now the example works corretly) 

Index: SDCGraphCreator.java
===================================================================
RCS file: /cvsroot/wsmx/components/discovery/src/main/org/deri/wsmx/discovery/caching/SDCGraphCreator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SDCGraphCreator.java	26 Apr 2007 15:38:43 -0000	1.5
--- SDCGraphCreator.java	29 May 2007 20:58:43 -0000	1.6
***************
*** 136,140 ****
  		if ( helper.getAllChildNodes(theExistingGT, sdcGraph).isEmpty() ) {
  			
! 			if ( !(sdcGraphManager.getGoalGraphArcByTarget(newGT, sdcGraph) == null ) ) {
  				List<Instance> theRedundantGGM = sdcGraphManager.getGoalGraphArcByTarget(newGT, sdcGraph); 
  				for (Instance aGGM : theRedundantGGM) {
--- 136,150 ----
  		if ( helper.getAllChildNodes(theExistingGT, sdcGraph).isEmpty() ) {
  			
! 			if ( sdcGraphManager.isIntersectionGT(newGT, sdcGraph) ) {
! 				
! 				List<Goal> parentsOfExistingGT = helper.getParentsFromGGM(sdcGraph, theExistingGT); 
! 				
! 				for (Goal aParent : parentsOfExistingGT) {
! 					sdcGraph = sdcGraphManager.deleteGoalGraphArc(sdcGraph,
! 							sdcGraphManager.getSingleGoalGraphArc(aParent, newGT, sdcGraph) ); 		
! 				}
! 					
! 				
! 			} else if ( !(sdcGraphManager.getGoalGraphArcByTarget(newGT, sdcGraph) == null ) ) {
  				List<Instance> theRedundantGGM = sdcGraphManager.getGoalGraphArcByTarget(newGT, sdcGraph); 
  				for (Instance aGGM : theRedundantGGM) {
***************
*** 174,178 ****
--- 184,191 ----
  				else if ( matchmaker.similarityIntersect(theExistingChild, newGT, sdcGraph)) {
  					logger.info("detecting an i-arc ...");
+ 	
  					sdcGraph = sdcGraphManager.addGoalTemplate(newGT, sdcGraph, "child");
+ 					sdcGraph = sdcGraphManager.addGoalGraphArc(helper.getParentsFromGGM(sdcGraph, theExistingChild).get(0), newGT, sdcGraph, "subsume"); 
+ 	
  					sdcGraph = iArcResolution(newGT,theExistingChild,sdcGraph); 
  				}

Index: SDCGraphManager.java
===================================================================
RCS file: /cvsroot/wsmx/components/discovery/src/main/org/deri/wsmx/discovery/caching/SDCGraphManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SDCGraphManager.java	26 Apr 2007 15:38:43 -0000	1.6
--- SDCGraphManager.java	29 May 2007 20:58:43 -0000	1.7
***************
*** 791,799 ****
  		
  		String parent1localID = parent1.getIdentifier().toString();
! 		parent1localID.replace(parent1.getDefaultNamespace().toString(), ""); 
! 		parent1localID.replace(".wsml", ""); 
  		String parent2localID = parent2.getIdentifier().toString();
! 		parent2localID.replace(parent2.getDefaultNamespace().toString(), ""); 
! 		parent2localID.replace(".wsml", ""); 
  		
  		Goal intersectGT = wsmoFactory.createGoal(
--- 791,799 ----
  		
  		String parent1localID = parent1.getIdentifier().toString();
! //		parent1localID.replace(parent1.getDefaultNamespace().toString(), ""); 
! //		parent1localID.replace(".wsml", ""); 
  		String parent2localID = parent2.getIdentifier().toString();
! //		parent2localID.replace(parent2.getDefaultNamespace().toString(), ""); 
! //		parent2localID.replace(".wsml", ""); 
  		
  		Goal intersectGT = wsmoFactory.createGoal(