pimath 0.0.20 → 0.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/dev/index.html +44 -37
  2. package/dev/pi.js +10 -3
  3. package/dev/pi.js.map +1 -1
  4. package/dist/pi.js +1 -1
  5. package/dist/pi.js.map +1 -1
  6. package/esm/maths/random/rndFraction.js +8 -2
  7. package/esm/maths/random/rndFraction.js.map +1 -1
  8. package/esm/maths/random/rndMonom.js +2 -1
  9. package/esm/maths/random/rndMonom.js.map +1 -1
  10. package/esm/maths/random/rndTypes.d.ts +1 -0
  11. package/package.json +1 -1
  12. package/src/maths/random/rndFraction.ts +7 -2
  13. package/src/maths/random/rndMonom.ts +2 -1
  14. package/src/maths/random/rndTypes.ts +2 -1
package/esm/maths/random/rndFraction.js CHANGED
@@ -10,7 +10,8 @@ class rndFraction extends randomCore_1.randomCore {
10
10
  this._defaultConfig = {
11
11
  negative: true,
12
12
  reduced: true,
13
- zero: true
13
+ zero: true,
14
+ natural: false
14
15
  };
15
16
  this._config = this.mergeConfig(userConfig, this._defaultConfig);
16
17
  }
@@ -22,7 +23,12 @@ class rndFraction extends randomCore_1.randomCore {
22
23
  else {
23
24
  Q.numerator = index_1.Random.number(this._config.zero ? 0 : 1, 10);
24
25
  }
25
- Q.denominator = index_1.Random.number(1, 10);
26
+ if (this._config.natural) {
27
+ Q.denominator = 1;
28
+ }
29
+ else {
30
+ Q.denominator = index_1.Random.number(1, 10);
31
+ }
26
32
  return this._config.reduced ? Q.reduce() : Q;
27
33
  };
28
34
  }
package/esm/maths/random/rndFraction.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rndFraction.js","sourceRoot":"","sources":["../../../src/maths/random/rndFraction.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,kDAAyC;AACzC,mCAA+B;AAK/B,MAAa,WAAY,SAAQ,uBAAU;IAIvC,YAAY,UAAoC;QAC5C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;SACb,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAa,EAAE;QACtB,IAAI,CAAC,GAAG,IAAI,uBAAQ,EAAE,CAAA;QAEtB,IAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC;YACrB,CAAC,CAAC,SAAS,GAAG,cAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACxD;aAAK;YACF,CAAC,CAAC,SAAS,GAAG,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;SAC7D;QACD,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAEpC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA,CAAC,CAAA,CAAC,CAAC,MAAM,EAAE,CAAA,CAAC,CAAA,CAAC,CAAA;IAC5C,CAAC,CAAA;CACJ;AA5BD,kCA4BC"}
1
+ {"version":3,"file":"rndFraction.js","sourceRoot":"","sources":["../../../src/maths/random/rndFraction.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,kDAAyC;AACzC,mCAA+B;AAK/B,MAAa,WAAY,SAAQ,uBAAU;IAIvC,YAAY,UAAoC;QAC5C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,KAAK;SACjB,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAa,EAAE;QACtB,IAAI,CAAC,GAAG,IAAI,uBAAQ,EAAE,CAAA;QAEtB,IAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC;YACrB,CAAC,CAAC,SAAS,GAAG,cAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACxD;aAAK;YACF,CAAC,CAAC,SAAS,GAAG,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;SAC7D;QACD,IAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAC;YACpB,CAAC,CAAC,WAAW,GAAG,CAAC,CAAA;SACpB;aAAK;YACF,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;SACvC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA,CAAC,CAAA,CAAC,CAAC,MAAM,EAAE,CAAA,CAAC,CAAA,CAAC,CAAA;IAC5C,CAAC,CAAA;CACJ;AAjCD,kCAiCC"}
package/esm/maths/random/rndMonom.js CHANGED
@@ -19,7 +19,8 @@ class rndMonom extends randomCore_1.randomCore {
19
19
  let M = new monom_1.Monom();
20
20
  M.coefficient = index_1.Random.fraction({
21
21
  zero: this._config.zero,
22
- reduced: true
22
+ reduced: true,
23
+ natural: !this._config.fraction
23
24
  });
24
25
  if (this._config.letters.length > 1) {
25
26
  for (let L of this._config.letters.split('')) {
package/esm/maths/random/rndMonom.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rndMonom.js","sourceRoot":"","sources":["../../../src/maths/random/rndMonom.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,mCAA+B;AAC/B,4CAAuC;AAKnC,MAAa,QAAS,SAAQ,uBAAU;IAIpC,YAAY,UAA8B;QACtC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,KAAK;SACd,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAU,EAAE;QAEnB,IAAI,CAAC,GAAG,IAAI,aAAK,EAAE,CAAA;QAGnB,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,QAAQ,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAEjC,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;gBAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrB;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,CAAC,GAAG,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrD,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;aAC7C;SACJ;aAAM;YACH,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;SACzD;QAED,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;CACJ;AA3CD,4BA2CC"}
1
+ {"version":3,"file":"rndMonom.js","sourceRoot":"","sources":["../../../src/maths/random/rndMonom.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,mCAA+B;AAC/B,4CAAuC;AAKnC,MAAa,QAAS,SAAQ,uBAAU;IAIpC,YAAY,UAA8B;QACtC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,KAAK;SACd,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAU,EAAE;QAEnB,IAAI,CAAC,GAAG,IAAI,aAAK,EAAE,CAAA;QAGnB,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,QAAQ,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAEjC,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;gBAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrB;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,CAAC,GAAG,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrD,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;aAC7C;SACJ;aAAM;YACH,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;SACzD;QAED,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;CACJ;AA5CD,4BA4CC"}
package/esm/maths/random/rndTypes.d.ts CHANGED
@@ -2,6 +2,7 @@ export declare type randomCoefficientConfig = {
2
2
  negative?: boolean;
3
3
  reduced?: boolean;
4
4
  zero?: boolean;
5
+ natural?: boolean;
5
6
  };
6
7
  export declare type randomMonomConfig = {
7
8
  letters?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pimath",
3
- "version": "0.0.20",
3
+ "version": "0.0.21",
4
4
  "description": "A math library for teacher :)",
5
5
  "scripts": {
6
6
  "test": "mocha -r ts-node/register 'tests/**/*.test.ts'",
package/src/maths/random/rndFraction.ts CHANGED
@@ -16,7 +16,8 @@ export class rndFraction extends randomCore {
16
16
  this._defaultConfig = {
17
17
  negative: true,
18
18
  reduced: true,
19
- zero: true
19
+ zero: true,
20
+ natural: false
20
21
  }
21
22
 
22
23
  this._config = this.mergeConfig(userConfig, this._defaultConfig)
@@ -30,7 +31,11 @@ export class rndFraction extends randomCore {
30
31
  }else {
31
32
  Q.numerator = Random.number(this._config.zero ? 0 : 1, 10)
32
33
  }
33
- Q.denominator = Random.number(1, 10)
34
+ if(this._config.natural){
35
+ Q.denominator = 1
36
+ }else {
37
+ Q.denominator = Random.number(1, 10)
38
+ }
34
39
 
35
40
  return this._config.reduced?Q.reduce():Q
36
41
  }
package/src/maths/random/rndMonom.ts CHANGED
@@ -30,7 +30,8 @@ import {Monom} from "../algebra/monom";
30
30
  // Generate the coefficient
31
31
  M.coefficient = Random.fraction({
32
32
  zero: this._config.zero,
33
- reduced: true
33
+ reduced: true,
34
+ natural: !this._config.fraction
34
35
  })
35
36
 
36
37
  // Calculate the degree of the monom
package/src/maths/random/rndTypes.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  export type randomCoefficientConfig = {
2
2
  negative?: boolean,
3
3
  reduced?: boolean,
4
- zero?:boolean
4
+ zero?:boolean,
5
+ natural?:boolean
5
6
  }
6
7
 
7
8
  export type randomMonomConfig = {