[Dmcs-notify] SF.net SVN: dmcs:[3301] dmcs/branches/dmcs1.5

[<mm...@us...>]

Revision: 3301
          http://dmcs.svn.sourceforge.net/dmcs/?rev=3301&view=rev
Author:   mmsc
Date:     2012-11-30 09:24:43 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Bug with cyclic-opt fixed.

Modified Paths:
--------------
    dmcs/branches/dmcs1.5/include/network/NewConcurrentMessageDispatcher.tcc
    dmcs/branches/dmcs1.5/src/mcs/CycleBreaker.cpp
    dmcs/branches/dmcs1.5/src/mcs/NewContext.cpp
    dmcs/branches/dmcs1.5/src/mcs/NormalContext.cpp

Modified: dmcs/branches/dmcs1.5/include/network/NewConcurrentMessageDispatcher.tcc
===================================================================
--- dmcs/branches/dmcs1.5/include/network/NewConcurrentMessageDispatcher.tcc	2012-11-29 22:20:23 UTC (rev 3300)
+++ dmcs/branches/dmcs1.5/include/network/NewConcurrentMessageDispatcher.tcc	2012-11-30 09:24:43 UTC (rev 3301)
@@ -39,7 +39,7 @@
 NewConcurrentMessageDispatcher::send(MQIDs id, MessageType* mess, int msecs)
 {
   assert (id < SEPARATOR);
-  DBGLOG(DBG, "NewConcurrentMessageDispatcher::send(" << id << ")");
+  //DBGLOG(DBG, "NewConcurrentMessageDispatcher::send(" << id << ")");
   ConcurrentMessageQueuePtr cmq = getMQ(id);
   return send(cmq.get(), mess, msecs);
 }
@@ -52,7 +52,7 @@
 				     MessageType* mess, int msecs)
 {
   assert (SEPARATOR < type && type < END_OF_MQ);
-  DBGLOG(DBG, "NewConcurrentMessageDispatcher::send(" << type << ", " << id << ")");
+  //DBGLOG(DBG, "NewConcurrentMessageDispatcher::send(" << type << ", " << id << ")");
   ConcurrentMessageQueuePtr cmq = getMQ(type, id);
   return send(cmq.get(), mess, msecs);
 }
@@ -91,7 +91,7 @@
 NewConcurrentMessageDispatcher::receive(MQIDs id, int msecs)
 {
   assert (id < SEPARATOR);
-  DBGLOG(DBG, "NewConcurrentMessageDispatcher::receive(" << id << ")");
+  //DBGLOG(DBG, "NewConcurrentMessageDispatcher::receive(" << id << ")");
   ConcurrentMessageQueuePtr cmq = getMQ(id);
   return receive<MessageType>(cmq.get(), msecs);
 }
@@ -103,7 +103,7 @@
 NewConcurrentMessageDispatcher::receive(MQIDs type, std::size_t id, int msecs)
 {
   assert (SEPARATOR < type && type < END_OF_MQ);
-  DBGLOG(DBG, "NewConcurrentMessageDispatcher::receive(" << type << ", " << id << ")");
+  //DBGLOG(DBG, "NewConcurrentMessageDispatcher::receive(" << type << ", " << id << ")");
   ConcurrentMessageQueuePtr cmq = getMQ(type, id);
   return receive<MessageType>(cmq.get(), msecs);
 }

Modified: dmcs/branches/dmcs1.5/src/mcs/CycleBreaker.cpp
===================================================================
--- dmcs/branches/dmcs1.5/src/mcs/CycleBreaker.cpp	2012-11-29 22:20:23 UTC (rev 3300)
+++ dmcs/branches/dmcs1.5/src/mcs/CycleBreaker.cpp	2012-11-30 09:24:43 UTC (rev 3301)
@@ -121,12 +121,21 @@
       NewBeliefState* current_guess = new NewBeliefState(BeliefStateOffset::instance()->NO_BLOCKS(),
 							 BeliefStateOffset::instance()->SIZE_BS());
       
-      (*current_guess) = (*starting_guess);      
+      (*current_guess) = (*starting_guess);
+      DBGLOG(DBG, "CycleBreaker::startup: starting guess = " << *current_guess);
 
       do
 	{
 	  if (compute(current_guess, k1, k2, parent_qid, eval, md)) break;
 	  current_guess = next_guess(current_guess, total_guessing_input);
+	  if (current_guess)
+	    {
+	      DBGLOG(DBG, "CycleBreaker::startup: current guess = " << *current_guess);
+	    }
+	  else
+	    {
+	      DBGLOG(DBG, "CycleBreaker::startup: current guess = NULL, break!");
+	    }
 	}
       while (current_guess);
 

Modified: dmcs/branches/dmcs1.5/src/mcs/NewContext.cpp
===================================================================
--- dmcs/branches/dmcs1.5/src/mcs/NewContext.cpp	2012-11-29 22:20:23 UTC (rev 3300)
+++ dmcs/branches/dmcs1.5/src/mcs/NewContext.cpp	2012-11-30 09:24:43 UTC (rev 3301)
@@ -72,7 +72,7 @@
 		    NewConcurrentMessageDispatcherPtr md)
 {
   ///@todo: create heads = (NULL, k1, k2) in case of real leaf node.
-  DBGLOG(DBG, "NormalContext[" << ctx_id << "]::compute(): input = " << *input);
+  DBGLOG(DBG, "NewContext[" << ctx_id << "]::compute(): input = " << *input);
   Heads* heads = evaluate_bridge_rules(bridge_rules, input, k1, k2,
 				       BeliefStateOffset::instance()->getStartingOffsets());      
   

Modified: dmcs/branches/dmcs1.5/src/mcs/NormalContext.cpp
===================================================================
--- dmcs/branches/dmcs1.5/src/mcs/NormalContext.cpp	2012-11-29 22:20:23 UTC (rev 3300)
+++ dmcs/branches/dmcs1.5/src/mcs/NormalContext.cpp	2012-11-30 09:24:43 UTC (rev 3301)
@@ -252,15 +252,21 @@
       (*current_guess) = (*starting_guess);
       
       // iterate over all possible guesses or until k1 --> k2 models were computed
-      DBGLOG(DBG, "NormalContext::process_request(). Guessing input = " << *total_guessing_input);
+      DBGLOG(DBG, "NormalContext::process_input(). Total guessing input = " << *total_guessing_input);
+      DBGLOG(DBG, "NormalContext::process_input(). input = " << *input);
+      DBGLOG(DBG, "NormalContext::process_input(). starting guess = " << *current_guess);
       bool computed_k1_k2 = false;
       do
 	{
 	  NewBeliefState* combined_input = 
 	    new NewBeliefState(BeliefStateOffset::instance()->NO_BLOCKS(),
 			       BeliefStateOffset::instance()->SIZE_BS());
-	  (*combined_input ) = (*input) | (*current_guess);
+	  (*combined_input) = (*input);
+	  (*combined_input) = (*combined_input) | (*current_guess);
 	  
+	  DBGLOG(DBG, "NormalContext::process_input(). input = " << *input);
+	  DBGLOG(DBG, "NormalContext::process_input(). combined input = " << *combined_input);
+
 	  if (compute(combined_input, k1, k2, parent_qid, eval, md)) 
 	    {
 	      computed_k1_k2 = true;
@@ -268,6 +274,14 @@
 	    }
 	  
 	  current_guess = next_guess(current_guess, total_guessing_input);
+	  if (current_guess)
+	    {
+	      DBGLOG(DBG, "NormalContext::process_input(). current guess = " << *current_guess);
+	    }
+	  else
+	    {
+	      DBGLOG(DBG, "NormalContext::process_input(). current guess = NULL. break!");
+	    }
 	}
       while (current_guess);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.