[Jspro-cvs] jsPro array.js,1.26,1.27
Brought to you by:
wigleys
|
From: <gat...@us...> - 2003-09-20 19:55:49
|
Update of /cvsroot/jspro/jsPro
In directory sc8-pr-cvs1:/tmp/cvs-serv5780
Modified Files:
array.js
Log Message:
QA: minor modifications and corrections
Index: array.js
===================================================================
RCS file: /cvsroot/jspro/jsPro/array.js,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** array.js 19 Sep 2003 15:44:21 -0000 1.26
--- array.js 20 Sep 2003 19:55:44 -0000 1.27
***************
*** 33,37 ****
* @summary average deviation
* @author Stuart Wigley
! * @version 1.0, 19/08/03
* @interface <code>Array.averageDev()</code>
* @interface <code>Array.averageDev(iStart)</code>
--- 33,37 ----
* @summary average deviation
* @author Stuart Wigley
! * @version 1.0, 09/19/03
* @interface <code>Array.averageDev()</code>
* @interface <code>Array.averageDev(iStart)</code>
***************
*** 97,104 ****
}
- var aAbsValues = new Array();
- var iCount = 0;
- var faverageDev = null;
-
var fMean = this.mean(iStart, iEnd);
--- 97,100 ----
***************
*** 107,119 ****
}
for (var i = iStart; i < iEnd; i++) {
if (typeof this[i] == 'number') {
! aAbsValues[iCount] = (Math.abs(this[i] - fMean));
iCount++;
}
}
! var faverageDev = aAbsValues.mean();
}
catch (vError) {
--- 103,121 ----
}
+ var aAbsoluteDevs = new Array();
+ var iCount = 0;
+
for (var i = iStart; i < iEnd; i++) {
if (typeof this[i] == 'number') {
! aAbsoluteDevs[iCount] = Math.abs(this[i] - fMean);
iCount++;
}
}
! var fAverageDev = aAbsoluteDevs.mean();
+ if (!fAverageDev) {
+ throw vError = new UnknownException('Array.averageDev');
+ }
}
catch (vError) {
***************
*** 125,129 ****
finally {
! return vError ? null : faverageDev;
}
}
--- 127,131 ----
finally {
! return vError ? null : fAverageDev;
}
}
***************
*** 368,378 ****
var fMean = this.mean(iStart, iLength);
! var fstandardDev = this.standardDev(iStart, iLength);
! if (!fMean || !fstandardDev) {
throw vError = new UnknownException('Array.covar');
}
! var fCovar = fstandardDev / fMean;
}
catch (vError) {
--- 370,380 ----
var fMean = this.mean(iStart, iLength);
! var fStandardDev = this.standardDev(iStart, iLength);
! if (!fMean || !fStandardDev) {
throw vError = new UnknownException('Array.covar');
}
! var fCovar = fStandardDev / fMean;
}
catch (vError) {
***************
*** 1096,1100 ****
}
! var fstandardDev = Math.sqrt(fVariance);
}
catch (vError) {
--- 1098,1102 ----
}
! var fStandardDev = Math.sqrt(fVariance);
}
catch (vError) {
***************
*** 1106,1110 ****
finally {
! return vError ? null : fstandardDev;
}
}
--- 1108,1112 ----
finally {
! return vError ? null : fStandardDev;
}
}
|