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

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

Revision: 11047
          http://octave.svn.sourceforge.net/octave/?rev=11047&view=rev
Author:   jpicarbajal
Date:     2012-09-18 15:23:21 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
statistics: fixing notation in docstring of linkage. Still improvements needed.

Modified Paths:
--------------
    trunk/octave-forge/main/mechanics/DESCRIPTION
    trunk/octave-forge/main/mechanics/inst/core/forcematrix.m
    trunk/octave-forge/main/statistics/inst/linkage.m

Modified: trunk/octave-forge/main/mechanics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/mechanics/DESCRIPTION	2012-09-18 06:25:30 UTC (rev 11046)
+++ trunk/octave-forge/main/mechanics/DESCRIPTION	2012-09-18 15:23:21 UTC (rev 11047)
@@ -1,6 +1,6 @@
 Name: Mechanics
-Version: 1.3.0
-Date: 2012-24-08
+Version: 1.3.1
+Date: 2012-29-08
 Author: Juan Pablo Carbajal <car...@if...>, Johan Beke <joh...@ho...>
 Maintainer: Juan Pablo Carbajal <car...@if...>, Johan Beke <joh...@ho...>
 Title: Classical Mechanics & Structural Analysis

Modified: trunk/octave-forge/main/mechanics/inst/core/forcematrix.m
===================================================================
--- trunk/octave-forge/main/mechanics/inst/core/forcematrix.m	2012-09-18 06:25:30 UTC (rev 11046)
+++ trunk/octave-forge/main/mechanics/inst/core/forcematrix.m	2012-09-18 15:23:21 UTC (rev 11047)
@@ -51,12 +51,13 @@
 %% distances between the points.
 %% @end itemize
 %%
-%% @html
-%% @include doc/matrixforce.svg
-%% @end html
 %% @seealso{pointmassmesh, polyval, vech, sub2ind}
 %% @end deftypefn
 
+%% @html
+%% @include ../doc/matrixforce.svg
+%% @end html
+
 function [F D dr] = forcematrix (pos, A, funcs)
 
   %% Argument parsing

Modified: trunk/octave-forge/main/statistics/inst/linkage.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/linkage.m	2012-09-18 06:25:30 UTC (rev 11046)
+++ trunk/octave-forge/main/statistics/inst/linkage.m	2012-09-18 15:23:21 UTC (rev 11047)
@@ -23,7 +23,7 @@
 ##
 ## Produce a hierarchical clustering dendrogram
 ##
-## @var{d} is the dissimilarity matrix relative to @var{n} observations,
+## @var{d} is the dissimilarity matrix relative to n observations,
 ## formatted as a @math{(n-1)*n/2}x1 vector as produced by @code{pdist}.
 ## Alternatively, @var{x} contains data formatted for input to
 ## @code{pdist}, @var{metric} is a metric for @code{pdist} and
@@ -31,11 +31,11 @@
 ## @code{pdist}.
 ##
 ## @code{linkage} starts by putting each observation into a singleton
-## cluster and numbering those from 1 to @var{n}.  Then it merges two
+## cluster and numbering those from 1 to n.  Then it merges two
 ## clusters, chosen according to @var{method}, to create a new cluster
-## numbered @var{n+1}, and so on until all observations are grouped into
-## a single cluster numbered @var{2*n-1}.  Row @var{m} of the
-## @math{m-1}x3 output matrix relates to cluster @math{n+m}: the first
+## numbered n+1, and so on until all observations are grouped into
+## a single cluster numbered 2*n-1.  Row m of the
+## (m-1)x3 output matrix relates to cluster n+m: the first
 ## two columns are the numbers of the two component clusters and column
 ## 3 contains their distance.
 ##

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