Commit 5e5983a0 authored by Grand Francois's avatar Grand Francois
Browse files

Suppression isCloseTo dans les tests

Showing with 10 additions and 43 deletions
+10 -43
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
// import { nub, res } from "./nubtest";
import { nub } from "./nubtest";
import { nub, precDigits } from "./nubtest";
import { Result } from "../src/base";
//var prec = 2; // The number of decimal points to check
var prec: number = 0.01;
describe('Class Nub: ', () => {
// beforeEach(() => {
......@@ -13,19 +10,16 @@ describe('Class Nub: ', () => {
// });
describe('Calc(): ', () => {
it('should return a result.vCalc equal to 3', () => {
//let res = new Result(3);
// expect(nub.Calc("C")).toEqual(res);
expect(nub.Calc("C").isCloseTo(3, prec));
let res = new Result(3);
expect(nub.Calc("C").vCalc).toBeCloseTo(res.vCalc, precDigits);
});
it('should return a result.vCalc equal to 1', () => {
// let res = new Result(1);
// expect(nub.Calc("A").vCalc).toBeCloseTo(res.vCalc, prec);
expect(nub.Calc("A").isCloseTo(1, prec));
let res = new Result(1);
expect(nub.Calc("A").vCalc).toBeCloseTo(res.vCalc, precDigits);
});
it('should return a result.vCalc equal to 2', () => {
// let res = new Result(2);
// expect(nub.Calc("B").vCalc).toBeCloseTo(res.vCalc, prec);
expect(nub.Calc("B").isCloseTo(2, prec));
let res = new Result(2); precDigits
expect(nub.Calc("B").vCalc).toBeCloseTo(res.vCalc, precDigits);
});
});
});
......@@ -4,7 +4,7 @@ import { Result } from "../src/base";
import { RegimeUniforme } from "../src/regime_uniforme";
import { cSnTrapez } from "../src/section/section_trapez";
import { cParamsCanal } from "../src/section/section_type";
import { precDist } from "./nubtest";
import { precDigits } from "./nubtest";
describe('Class RegimeUniforme / section trapèze: ', () => {
beforeAll(() => {
......@@ -22,9 +22,8 @@ describe('Class RegimeUniforme / section trapèze: ', () => {
var ru: RegimeUniforme;
ru = new RegimeUniforme(sect);
// let res = new Result(1.515);
// expect(sect.Calc("q").vCalc).toEqual(res.vCalc);
expect(ru.Calc("q").isCloseTo(9.393, precDist));
let res = new Result(9.393);
expect(ru.Calc("q").vCalc).toBeCloseTo(res.vCalc, precDigits);
});
});
});
......@@ -3,17 +3,6 @@ import { Dichotomie } from "./dichotomie"
/**
* Résultat de calcul comprenant la valeur du résultat et des calculs annexes (flag, calculs intermédiaires...)
*/
// export class Result {
// /** Valeur calculée */
// public vCalc: number;
// /** Variables intermédiaires, flags d'erreur */
// public extraVar: {};
// constructor() {
// this.extraVar = {};
// }
// }
export class Result {
/** Valeur calculée */
......@@ -28,21 +17,6 @@ export class Result {
};
get vCalc() { return this._vCalc; }
/**
* teste la proximité de la valeur avec une autre
* @param v valeur à tester
* @param dist distance max avec la valeur à tester
* @return true si abs( this - valeur test ) <= dist
*/
isCloseTo(v: number, dist: number): boolean {
// console.log('this ' + this._vCalc);
// console.log('v ' + v);
// console.log('dist ' + dist);
// console.log('abs ' + Math.abs(this._vCalc - v));
// console.log('res ' + (Math.abs(this._vCalc - v) <= dist));
return Math.abs(this._vCalc - v) <= dist;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment