[Octave-cvsupdate] SF.net SVN: octave:[9153] trunk/octave-forge/main

[<jpi...@us...>]

Revision: 9153
          http://octave.svn.sourceforge.net/octave/?rev=9153&view=rev
Author:   jpicarbajal
Date:     2011-11-20 21:40:10 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
signal. Fixing bugs in cl2bp_lib.h and sigmoid_train
geometry. updatig svg

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/inst/io/@svg/svg.m
    trunk/octave-forge/main/signal/inst/sigmoid_train.m
    trunk/octave-forge/main/signal/src/cl2bp_lib.h

Modified: trunk/octave-forge/main/geometry/inst/io/@svg/svg.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/io/@svg/svg.m	2011-11-20 21:11:02 UTC (rev 9152)
+++ trunk/octave-forge/main/geometry/inst/io/@svg/svg.m	2011-11-20 21:40:10 UTC (rev 9153)
@@ -41,7 +41,6 @@
   ## All the paths stored in polyval compatible format. Straigth segments are also stored as a polynomial.
   svg.Path = struct();
 
-  ## SVG paths. All the paths of the svg
   svg = class (svg, 'svg');
 
   if !isempty (name)
@@ -81,4 +80,3 @@
 %! dc = svg('drawing6.svg');
 %! dc.plot();
 %! dc.plot('color','r','linewidth',2);
-

Modified: trunk/octave-forge/main/signal/inst/sigmoid_train.m
===================================================================
--- trunk/octave-forge/main/signal/inst/sigmoid_train.m	2011-11-20 21:11:02 UTC (rev 9152)
+++ trunk/octave-forge/main/signal/inst/sigmoid_train.m	2011-11-20 21:40:10 UTC (rev 9153)
@@ -38,9 +38,9 @@
   if isscalar (timeconstant)
     %% All bumps have the same time constant and are symmetric
     timeconstant = timeconstant * ones (nRanges,2);
-  end
 
-  if isvector (timeconstant)
+  elseif any( size(timeconstant) != [1 1])
+
     %% All bumps have different time constant but are symmetric
     if length(timeconstant) ~= nRanges
       error('signalError','Length of time constant must equal number of ranges.')
@@ -49,6 +49,7 @@
       timeconstant = timeconstant';
     end
     timeconstant = repmat (timeconstant,1,2);
+
   end
 
   %% Make sure t is horizontal

Modified: trunk/octave-forge/main/signal/src/cl2bp_lib.h
===================================================================
--- trunk/octave-forge/main/signal/src/cl2bp_lib.h	2011-11-20 21:11:02 UTC (rev 9152)
+++ trunk/octave-forge/main/signal/src/cl2bp_lib.h	2011-11-20 21:40:10 UTC (rev 9153)
@@ -31,6 +31,7 @@
 #ifndef CL2BP_H
 #define CL2BP_H
 
+#include <cstdlib>
 #include <cassert>
 #include <cstring> //for memset
 

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