Commit fa36dd29 authored by Grand Francois's avatar Grand Francois
Browse files

#45 classe Result : ajout de la propriété "name" pour désigner de quel...

 #45 classe Result : ajout de la propriété "name" pour désigner de quel résultat on parle (symbole du paramètre, etc...)
Showing with 17 additions and 3 deletions
+17 -3
...@@ -47,12 +47,14 @@ export abstract class Nub extends ComputeNode implements IReferencedObject { ...@@ -47,12 +47,14 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
} }
if (computedVar.isAnalytical()) { if (computedVar.isAnalytical()) {
this._result = this.Equation(sVarCalc); this._result = this.Equation(sVarCalc);
this._result.name = sVarCalc;
return this._result; return this._result;
} }
const resSolve: Result = this.Solve(sVarCalc, rInit, rPrec); const resSolve: Result = this.Solve(sVarCalc, rInit, rPrec);
if (!resSolve.ok) { if (!resSolve.ok) {
this._result = resSolve; this._result = resSolve;
this._result.name = sVarCalc;
return this._result; return this._result;
} }
const sAnalyticalPrm: string = this.getFirstAnalyticalParameter().symbol; const sAnalyticalPrm: string = this.getFirstAnalyticalParameter().symbol;
...@@ -60,6 +62,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject { ...@@ -60,6 +62,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
const res: Result = this.Equation(sAnalyticalPrm); const res: Result = this.Equation(sAnalyticalPrm);
res.vCalc = resSolve.vCalc; res.vCalc = resSolve.vCalc;
this._result = res; this._result = res;
this._result.name = sVarCalc;
return res; return res;
} }
...@@ -70,9 +73,6 @@ export abstract class Nub extends ComputeNode implements IReferencedObject { ...@@ -70,9 +73,6 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
* @param sDonnee éventuel symbole du paramètre à calculer * @param sDonnee éventuel symbole du paramètre à calculer
*/ */
public CalcSerie(rPrec: number = 0.001, rInit?: number, sDonnee?: string): Result { public CalcSerie(rPrec: number = 0.001, rInit?: number, sDonnee?: string): Result {
const res = new Result();
this._result = res;
let variatedParam: ParamDefinition; let variatedParam: ParamDefinition;
let computedParam: ParamDefinition; let computedParam: ParamDefinition;
for (const p of this.parameterIterator) { for (const p of this.parameterIterator) {
...@@ -126,6 +126,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject { ...@@ -126,6 +126,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
this._result = res; this._result = res;
} }
this._result.name = computedSymbol;
return this._result; return this._result;
} }
......
...@@ -15,6 +15,11 @@ export class Result { ...@@ -15,6 +15,11 @@ export class Result {
private _resultElements: ResultElement[]; private _resultElements: ResultElement[];
/**
* nom de la variable/paramètre calculé
*/
private _name: string;
constructor(v?: number | Message | ResultElement, d?: any) { constructor(v?: number | Message | ResultElement, d?: any) {
this._globalLog = new cLog(); this._globalLog = new cLog();
this._resultElements = []; this._resultElements = [];
...@@ -29,6 +34,14 @@ export class Result { ...@@ -29,6 +34,14 @@ export class Result {
} }
} }
public get name(): string {
return this._name;
}
public set name(n: string) {
this._name = n;
}
/** /**
* retourne le journal de la calculette * retourne le journal de la calculette
*/ */
......
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