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

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

Revision: 3302
          http://dmcs.svn.sourceforge.net/dmcs/?rev=3302&view=rev
Author:   mmsc
Date:     2012-12-03 10:59:03 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Fixed a bug in Joiner.

Modified Paths:
--------------
    dmcs/branches/dmcs1.5/examples/test/runTest.sh
    dmcs/branches/dmcs1.5/include/mcs/StreamingJoiner.h
    dmcs/branches/dmcs1.5/src/mcs/StreamingJoiner.cpp

Modified: dmcs/branches/dmcs1.5/examples/test/runTest.sh
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/runTest.sh	2012-11-30 09:24:43 UTC (rev 3301)
+++ dmcs/branches/dmcs1.5/examples/test/runTest.sh	2012-12-03 10:59:03 UTC (rev 3302)
@@ -27,32 +27,37 @@
 #################################################################################
 moveLogFiles()
 {
-    noargs=$#
-    optimized=opt_
-    loopMode=noloop_
+    mvTopoName=$1
+    mvTestName=$2
+    mvTestPack=$3
+    mvRunOpt=$4
+    mvNoLoop=$5
+
+    optimized=
+    loopMode=
     mode=
-    if [ $noargs -eq 3 ] ; then
-	optimized=
-	loopMode=
-    elif [ $noargs -eq 4 ] ; then
-	loopMode=	
+
+    if [ x$mvRunOpt = xopt ] ; then
+	optimized=opt_
     fi
-    
-    toponame=$1
-    testname=$2
+
+    if [ x$mvNoLoop = xnoloop ] ; then
+	loopMode=noloop_
+    fi
+
     mode=$optimized$loopMode$3
     basedir=../../..
 
     createSubDir $basedir/output
-    createSubDir $basedir/output/$toponame
-    createSubDir $basedir/output/$toponame/$testname
-    createSubDir $basedir/output/$toponame/$testname/$mode
+    createSubDir $basedir/output/$mvTopoName
+    createSubDir $basedir/output/$mvTopoName/$mvTestName
+    createSubDir $basedir/output/$mvTopoName/$mvTestName/$mode
 
     if [ x$WANTLOG = xyes ] ; then
-	rm $basedir/output/$toponame/$testname/$mode/*
+	rm $basedir/output/$mvTopoName/$mvTestName/$mode/*
     fi
 
-    mv *.log $basedir/output/$toponame/$testname/$mode
+    mv *.log $basedir/output/$mvTopoName/$mvTestName/$mode
 } # end of moveLogFiles
 
 #################################################################################
@@ -136,9 +141,10 @@
 	    
 	    no_test_packs=${#testpack[@]}
 	    for ((i = 0; i < $no_test_packs; ++i)) ; do
-		runOneInstance $filename $toponame $testname ${testpack[$i]}
-		runOneInstance $filename $toponame $testname ${testpack[$i]} opt
-		if [ $i -gt 0 ] ; then
+		runOneInstance $filename $toponame $testname ${testpack[$i]} noopt loop
+		runOneInstance $filename $toponame $testname ${testpack[$i]} opt loop
+		if [ $i -gt 1 ] ; then
+		    runOneInstance $filename $toponame $testname ${testpack[$i]} noopt noloop
 		    runOneInstance $filename $toponame $testname ${testpack[$i]} opt noloop
 		fi
 	    done

Modified: dmcs/branches/dmcs1.5/include/mcs/StreamingJoiner.h
===================================================================
--- dmcs/branches/dmcs1.5/include/mcs/StreamingJoiner.h	2012-11-30 09:24:43 UTC (rev 3301)
+++ dmcs/branches/dmcs1.5/include/mcs/StreamingJoiner.h	2012-12-03 10:59:03 UTC (rev 3302)
@@ -47,11 +47,13 @@
   StreamingJoiner(std::size_t ps,
 		  NewNeighborVecPtr n);
 
+#if 0
   ReturnedBeliefState*
   trigger_join(std::size_t query_id,
 	       const NewHistory& history,
 	       NewConcurrentMessageDispatcherPtr md,
 	       NewJoinerDispatcherPtr jd);
+#endif 
 
   ReturnedBeliefState*
   first_join(std::size_t query_id, 
@@ -69,11 +71,13 @@
   void
   reset();
 
+#if 0
   ReturnedBeliefState*
   process(std::size_t query_id, 
 	  const NewHistory& history,
 	  NewConcurrentMessageDispatcherPtr md,
 	  NewJoinerDispatcherPtr jd);
+#endif
 
   bool
   do_join(std::size_t query_id);
@@ -119,7 +123,7 @@
   // if pack_size == 0, we ask for all models
   std::size_t pack_size;            
   std::size_t next_neighbor;
-  bool first_round;
+  //  bool first_round;
   bool asking_next;
   std::vector<std::size_t> pack_count;
   NeighborOffset2IndexPtr offset2index;

Modified: dmcs/branches/dmcs1.5/src/mcs/StreamingJoiner.cpp
===================================================================
--- dmcs/branches/dmcs1.5/src/mcs/StreamingJoiner.cpp	2012-11-30 09:24:43 UTC (rev 3301)
+++ dmcs/branches/dmcs1.5/src/mcs/StreamingJoiner.cpp	2012-12-03 10:59:03 UTC (rev 3302)
@@ -40,7 +40,7 @@
     pack_size(ps),
     offset2index(new NeighborOffset2Index),
     next_neighbor(0),
-    first_round(true),
+    //    first_round(true),
     asking_next(false),
     pack_count(n->size(), 0)
 {
@@ -62,7 +62,7 @@
 {
   BaseJoiner::reset();
 
-  first_round = true;
+  //  first_round = true;
   asking_next = false;
   next_neighbor = 0;
   
@@ -71,7 +71,7 @@
 }
 
 
-
+#if 0
 ReturnedBeliefState*
 StreamingJoiner::trigger_join(std::size_t query_id, 
 			      const NewHistory& history,
@@ -121,6 +121,7 @@
       return end_rbs;
     }
 }
+#endif
 
 
 
@@ -130,8 +131,8 @@
 			    NewConcurrentMessageDispatcherPtr md,
 			    NewJoinerDispatcherPtr jd)
 {
-  // Warming up round, set first_round to FALSE
-  first_round = false;
+  reset();
+  //  first_round = false;
 
   if (!ask_first_packs(query_id, history, 0, neighbors->size()-1, md, jd))
     {

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