[service-technology.org] r9484 - in /trunk/lola2/src/Exploration: TSCCExplorationAGEF.cc TSCCExplorationEFAGEF.cc

[markusvalentin19]

Author: vm069
Date: Tue Jun  3 16:06:46 2014
New Revision: 9484

URL: http://svn.gna.org/viewcvs/service-tech?rev=9484&view=rev
Log:
removed unnecessary variable in AGEF, modified EFAGEF so it now works

Modified:
    trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc
    trunk/lola2/src/Exploration/TSCCExplorationEFAGEF.cc

Modified: trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc
URL: 
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc?rev=9484&r1=9483&r2=9484&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc  (original)
+++ trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc  Tue Jun  3 16:06:46 2014
@@ -33,9 +33,6 @@
     // get initial firelist
     index_t *currentFirelist;
     index_t currentEntry = myFirelist.getFirelist(ns, &currentFirelist);
-
-    //init boolean result
-    bool result = true;
 
     //last dfs where property was true
     index_t lasttrue = 0;
@@ -112,7 +109,6 @@
             if (dfsstack.StackPointer == 0)
             {
                 //set the property value
-                property.value = result;
                 return property.value;
             }
 
@@ -132,14 +128,16 @@
                 {
                     //for the current tscc "add" one more true
                     //just for clarification of the code...
-                    return true;
+                    property.value=true;
+                    return property.value;
                 }
                 else
                 {
                     //there is a tscc in which the property is not true
                     //then we can exit going forward to find one path where it
                     //is true
-                    return false;
+                    property.value=false;
+                    return property.value;
                 }
                 //update the highest lowlink to the current
                 highest_lowlink = stackentry.lowlink;

Modified: trunk/lola2/src/Exploration/TSCCExplorationEFAGEF.cc
URL: 
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/TSCCExplorationEFAGEF.cc?rev=9484&r1=9483&r2=9484&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/TSCCExplorationEFAGEF.cc        (original)
+++ trunk/lola2/src/Exploration/TSCCExplorationEFAGEF.cc        Tue Jun  3 
16:06:46 2014
@@ -49,17 +49,7 @@
 
     while (true)
     {
-        if (currentEntry > 0)
-        {
-            fprintf(stderr, "firelist: ");
-            for (index_t i = 0; i < currentEntry; i++)
-            {
-                fprintf(stderr, "%d\t", currentFirelist[i]);
-            }
-            fprintf(stderr, "\n");
-        }
-
-        if (currentEntry-- > 0)
+        if(currentEntry-- > 0)
         {
 
             //fire the next enabled transition
@@ -124,7 +114,7 @@
             //if the stack is empty we are finished
             if (dfsstack.StackPointer == 0)
             {
-                return false;
+                return property.value;
             }
 
             //getting v'
@@ -138,11 +128,12 @@
                     && highest_lowlink < stackentry.lowlink)
             {
 
-                //valid for ef :)
-                if ((lasttrue >= stackentry.lowlink ) & ( lastfalse < 
stackentry.lowlink ))
+                //valid for efagef :)
+                if( lasttrue >= stackentry.lowlink ) 
                 {
                     //for the current tscc "add" one more true
                     //just for clarification of the code...
+                    property.value = true;
                     return true;
                 }
                 //update the highest lowlink to the current


-- 
You received this e-mail, because you subscribed the mailing list 
"service-tech-commits" which will forward you any e-mail addressed to 
service-tech-commits@gna.org. If you want to unsubscribe or make any changes to 
your subscription, please go to
https://mail.gna.org/listinfo/service-tech-commits.