* Se corrige bug en el Splitter del modelo. Lo que pasaba es que si alguna entrada era

   0, se cagaba todo.

diff --git a/Model/src/splitter.cpp b/Model/src/splitter.cpp
index cd3ccad169eb7d057e291ae15c9c763bf7b71df1..a2737894b6423758465aa960ca7c62b12bfe0864 100644 (file)
--- a/Model/src/splitter.cpp
+++ b/Model/src/splitter.cpp
@@ -54,8 +54,12 @@ void Splitter::recieve_msg(int msg, IConector *who, void *data)
                        std::cout << name << ":Split " << max << std::endl;
 #endif
                        if (pos == OUT) {
                        std::cout << name << ":Split " << max << std::endl;
 #endif
                        if (pos == OUT) {

-                               if (max < actual_flow)  actual_flow = max;
-                               if (max_flow < actual_flow) actual_flow = max_flow;
+                               if (max == 0) {
+                                       actual_flow = max_flow;
+                               } else {
+                                       if (max < actual_flow)  actual_flow = max;
+                                       if (max_flow < actual_flow) actual_flow = max_flow;
+                               }

                        } else {
                                        if (((2*max) < actual_flow) && (max != 0))
                                                actual_flow = 2*max;
                        } else {
                                        if (((2*max) < actual_flow) && (max != 0))
                                                actual_flow = 2*max;

diff --git a/docs/manual_proyecto.lyx b/docs/manual_proyecto.lyx
index 291174bb88bf82da2ccd9cc15d87eac03943543a..c39f71a0708e453ac91fa31c8ab89edac6f82fd0 100644 (file)
--- a/docs/manual_proyecto.lyx
+++ b/docs/manual_proyecto.lyx
@@ -3,17 +3,21 @@
 \textclass book
 \language spanish
 \inputencoding auto
 \textclass book
 \language spanish
 \inputencoding auto

-\fontscheme default
+\fontscheme palatino

 \graphics default
 \paperfontsize default
 \spacing single 
 \papersize Default
 \paperpackage a4
 \graphics default
 \paperfontsize default
 \spacing single 
 \papersize Default
 \paperpackage a4

-\use_geometry 0
+\use_geometry 1

 \use_amsmath 0
 \use_natbib 0
 \use_numerical_citations 0
 \paperorientation portrait
 \use_amsmath 0
 \use_natbib 0
 \use_numerical_citations 0
 \paperorientation portrait

+\leftmargin 1.5cm
+\topmargin 1.5cm
+\rightmargin 2.5cm
+\bottommargin 1.5cm

 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent


@@ -178,130 +182,199 @@ PlaQui - Grafica de Progreso SVN
 --------------------------------
 \layout LyX-Code
 
 --------------------------------
 \layout LyX-Code
 

-Fecha  Commits
+Fech            Commits

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-08     *(luca)
+2003-10-08      **                                                     
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-12     *******(rmarkie)
+2003-10-10      *****                                                  
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-13     **(rmarkie|luca)
+2003-10-11      ***                                                    
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-15     *(rmarkie)
+2003-10-12      **********                                             
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-16     *(rmarkie)
+2003-10-13      *****                                                  
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-17     ***(rmarkie)
+2003-10-14      *                                                      
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-18     **(rmarkie)
+2003-10-15      ****                                                   
+  (rmarkie|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-19     ***(luca)
+2003-10-16      *****                                                  
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-20     ***(rmarkie|luca)
+2003-10-17      ************                                           
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-21     ***(rmarkie|luca)
+2003-10-18      **********                                             
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-22     ****(luca)
+2003-10-19      *****                                                  
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-23     *****(rmarkie)
+2003-10-20      ****                                                   
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-24     *****(rmarkie|luca)
+2003-10-21      *****                                                  
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-26     *(luca)
+2003-10-22      ************                                           
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-10-28     ***(sagar|rmarkie)
+2003-10-23      ******                                                 
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-06     ****(rmarkie)
+2003-10-24      ***********                                            
+  (sagar)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-07     **(rmarkie)
+2003-10-25      *                                                      
+  (sagar)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-08     ****(rmarkie|sagar|luca)
+2003-10-26      **                                                     
+  (sagar|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-11     *****(rmarkie)
+2003-10-28      ***                                                    
+  (sagar)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-12     ***(rmarkie|sagar|luca)
+2003-10-29      ***                                                    
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-13     *********(rmarkie|luca)
+2003-11-05      ****                                                   
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-15     *(rmarkie)
+2003-11-06      **********                                             
+  (rmarkie|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-16     *****(rmarkie|luca)
+2003-11-07      ******                                                 
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-17     *********(luca)
+2003-11-08      *******                                                
+  (sagar)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-18     **************(luca)
+2003-11-09      ****                                                   
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-19     *********(luca)
+2003-11-11      ********                                               
+  (sagar|rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-20     ********************(rmarkie|sagar|luca)
+2003-11-12      ****                                                   
+  (sagar)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-21     ***(luca)
+2003-11-13      *************                                          
+  (rmarkie|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-22     **(luca)
+2003-11-15      *                                                      
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-23     ************(luca)
+2003-11-16      *******                                                
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-24     ******(rmarkie|luca)
+2003-11-17      *************                                          
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-25     ******(rmarkie|luca)
+2003-11-18      **********************                                 
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-26     ***(luca)
+2003-11-19      ***************                                        
+  (sagar|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-27     ***(rmarkie)
+2003-11-20      ***************************                            
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-28     ***(luca)
+2003-11-21      ****                                                   
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-29     *****(luca)
+2003-11-22      **                                                     
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-11-30     ***************(rmarkie|luca)
+2003-11-23      *****************                                      
+  (luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-12-01     ****************************************(luca)
+2003-11-24      *******                                                
+  (rmarkie|luca)

 \layout LyX-Code
 
 \layout LyX-Code
 

-2003-12-02     *********************************(luca)
+2003-11-25      ******                                                 
+  (rmarkie)

 \layout LyX-Code
 
 \layout LyX-Code
 

-( ) = Máximo Commiteador del Día
+2003-11-26      ***                                                    
+  (luca)
+\layout LyX-Code
+
+2003-11-27      ****                                                   
+  (rmarkie)
+\layout LyX-Code
+
+2003-11-28      ***                                                    
+  (luca)
+\layout LyX-Code
+
+2003-11-29      *******                                                
+  (luca)
+\layout LyX-Code
+
+2003-11-30      **********************                                 
+  (rmarkie)
+\layout LyX-Code
+
+2003-12-01      *******************************************************
+  (luca)
+\layout LyX-Code
+
+2003-12-02      *****************************************              
+  (luca)
+\layout LyX-Code
+
+( ) = Máximo/s Commiteador/es del Día
+\layout LyX-Code
+
+* == 2 Commit

 \layout LyX-Code
 
 \layout LyX-Code
 

-* == 1 Commit

 \layout Standard
 
 Los usuarios son:
 \layout Standard
 
 Los usuarios son:

diff --git a/log_trace.pl b/log_trace.pl
index f4a2d017a5feca0b35f3a673c8eceabb6d0ac2dc..2a71eb58f25898cba40fd0b167634245b458d677 100755 (executable)
--- a/log_trace.pl
+++ b/log_trace.pl
@@ -45,8 +45,8 @@ foreach $date (sort keys %hash) {
                }
        }
 
                }
        }
 

-       for($i=0; $i<$max; $i++) {
-               if ($i < $hash{$date}) {
+       for($i=0; $i<$max/2; $i++) {
+               if ($i < $hash{$date}/2) {

                        print "*";
                } else {
                        print " ";
                        print "*";
                } else {
                        print " ";


@@ -58,5 +58,5 @@ foreach $date (sort keys %hash) {
 
 print "\n";
 print "( ) = Máximo/s Commiteador/es del Día\n";
 
 print "\n";
 print "( ) = Máximo/s Commiteador/es del Día\n";

-print "* == 1 Commit\n";
+print "* == 2 Commit\n";