Changeset 397

Show
Ignore:
Timestamp:
08/10/10 16:46:28 (1 year ago)
Author:
ke
Message:

Introduced LogicProgrammingBridgeEventType?.STEP_CALL, now used by tree behavior, soon also by profiler.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • kahina/trunk/src/org/kahina/core/behavior/KahinaTreeBehavior.java

    r212 r397  
    1212    { 
    1313        super(tree, kahina); 
    14         KahinaRunner.getControl().registerListener("tree", this); 
    1514    } 
    1615     

  • kahina/trunk/src/org/kahina/lp/behavior/LogicProgrammingTreeBehavior.java

    r346 r397  
    1717import org.kahina.core.event.KahinaEvent; 
    1818import org.kahina.core.event.KahinaSystemEvent; 
    19 import org.kahina.core.event.KahinaTreeEvent; 
    20 import org.kahina.core.event.KahinaTreeEventType; 
    2119import org.kahina.lp.LogicProgrammingState; 
    2220import org.kahina.lp.LogicProgrammingStep; 
    …… 
    393391                if (verbose) 
    394392                        System.err.println("LogicProgrammingTreeBehavior.processEvent(" + e + ")"); 
    395                 if (e instanceof KahinaTreeEvent) 
    396                 { 
    397                         processEvent((KahinaTreeEvent) e); 
    398                 } else if (e instanceof LogicProgrammingBridgeEvent) 
     393                if (e instanceof LogicProgrammingBridgeEvent) 
    399394                { 
    400395                        processEvent((LogicProgrammingBridgeEvent) e); 
    …… 
    405400        } 
    406401 
    407         public void processEvent(KahinaTreeEvent e) 
    408         { 
    409                 switch (e.getTreeEventType()) 
    410                 { 
    411                         case KahinaTreeEventType.NEW_NODE: 
    412                         { 
    413                                 integrateIncomingNode(e.getFirstID(), e.getSecondID()); 
    414                                 break; 
    415                         } 
    416                 } 
    417         } 
    418  
    419402        public void processEvent(LogicProgrammingBridgeEvent e) 
    420403        { 
    421404                switch (e.getEventType()) 
    422405                { 
     406                        case LogicProgrammingBridgeEventType.STEP_CALL: 
     407                        { 
     408                                integrateIncomingNode(e.getID(), e.getIntContent()); 
     409                                break; 
     410                        } 
    423411                        case LogicProgrammingBridgeEventType.SET_GOAL_DESC: 
    424412                        { 

  • kahina/trunk/src/org/kahina/lp/bridge/LogicProgrammingBridge.java

    r396 r397  
    129129                                System.err.println("LogicProgrammingBridge.registerStepLocation(" + extID + "," + parentID + ")"); 
    130130                        int stepID = convertStepID(extID); 
    131                         KahinaRunner.processEvent(new KahinaTreeEvent(KahinaTreeEventType.NEW_NODE, stepID, convertStepID(parentID))); 
     131                        int internalParentID = convertStepID(parentID); 
     132                        // used by tree behavior: 
     133                        KahinaRunner.processEvent(new LogicProgrammingBridgeEvent(LogicProgrammingBridgeEventType.STEP_CALL, stepID, internalParentID)); 
     134                        // used by node counter: 
     135                        KahinaRunner.processEvent(new KahinaTreeEvent(KahinaTreeEventType.NEW_NODE, stepID, internalParentID)); 
    132136                        currentID = stepID; 
    133137                        if (VERBOSE) 

  • kahina/trunk/src/org/kahina/lp/event/LogicProgrammingBridgeEvent.java

    r320 r397  
    1515    private int intContent; 
    1616     
    17     public LogicProgrammingBridgeEvent(int eventType, int externalID) 
     17    public LogicProgrammingBridgeEvent(int eventType, int internalID) 
    1818    { 
    1919        super("logic programming bridge"); 
    20         this.id = externalID; 
     20        this.id = internalID; 
    2121        this.eventType = eventType; 
    2222    } 
    2323     
    24     public LogicProgrammingBridgeEvent(int eventType, int externalID, String strContent) 
     24    public LogicProgrammingBridgeEvent(int eventType, int internalID, String strContent) 
    2525    { 
    2626        super("logic programming bridge"); 
    27         this.id = externalID; 
     27        this.id = internalID; 
    2828        this.eventType = eventType; 
    2929        this.strContent = strContent; 
    3030    } 
    3131     
    32     public LogicProgrammingBridgeEvent(int eventType, int externalID, int intContent) 
     32    public LogicProgrammingBridgeEvent(int eventType, int internalID, int intContent) 
    3333    { 
    3434        super("logic programming bridge"); 
    35         this.id = externalID; 
     35        this.id = internalID; 
    3636        this.eventType = eventType; 
    3737        this.intContent = intContent; 
    3838    } 
    3939     
    40     public LogicProgrammingBridgeEvent(int eventType, int externalID, String strContent, int intContent) 
     40    public LogicProgrammingBridgeEvent(int eventType, int internalID, String strContent, int intContent) 
    4141    { 
    4242        super("logic programming bridge"); 
    43         this.id = externalID; 
     43        this.id = internalID; 
    4444        this.eventType = eventType; 
    4545        this.strContent = strContent; 

  • kahina/trunk/src/org/kahina/lp/event/LogicProgrammingBridgeEventType.java

    r335 r397  
    99    public static final int STEP_NONDET_EXIT = 4; 
    1010    public static final int STEP_FAIL = 5; 
     11        public static final int STEP_CALL = 6; 
    1112}