[go: up one dir, main page]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nnmf #80

Open
wants to merge 63 commits into
base: main
Choose a base branch
from
Open

Nnmf #80

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
b25e8db
Add minValue for randInt
Goneiross Oct 10, 2018
00c765f
Add minValue for randInt
Goneiross Oct 10, 2018
836538e
Add NNMF
Goneiross Oct 19, 2018
5e5ae9b
fix for NMF
Goneiross Oct 19, 2018
d9accce
Change syntax
Goneiross Oct 19, 2018
1dcab6f
Fix for nnmf
Goneiross Oct 23, 2018
5cfc53d
Add error function
Goneiross Oct 23, 2018
9185d71
Replace abs error by relative error
Goneiross Oct 23, 2018
f62f2e6
Add NNMF to Index
Goneiross Oct 23, 2018
1663074
Add test for NNMF
Goneiross Oct 23, 2018
d3438bd
debug error
Goneiross Oct 26, 2018
515900e
Debug NNMF.doError
Goneiross Oct 26, 2018
1623c1a
Remove useless dependencies for NNMF test
Goneiross Oct 26, 2018
317b298
Remove useless parameters for NNMF
Goneiross Oct 26, 2018
8eea84e
small modifications
lpatiny Oct 26, 2018
af958ae
make doNnmf not accessible from outside
lpatiny Oct 26, 2018
ddb96ae
Change error as a getter
Goneiross Oct 27, 2018
ef06346
add examples folder
lpatiny Nov 7, 2018
83dbb1f
add matrix examples
lpatiny Nov 7, 2018
cbb79bd
Add test for positivity
Goneiross Nov 8, 2018
d222b85
Change NNMF ini from rand to 0.5
Goneiross Nov 8, 2018
41d8991
Add new test for NNMF
Goneiross Nov 8, 2018
d44a77c
Moved NNMF positivity function to test
Goneiross Nov 8, 2018
f2f28de
Change back NNMF ini to random matrix
Goneiross Nov 8, 2018
8d1cf72
Change NNMF parameters from (Matrix, r, {iterations}) to (Matrix, r, …
Goneiross Nov 8, 2018
844f8cc
Fix for NaN
Goneiross Nov 8, 2018
d11fe0a
Change tests
Goneiross Nov 8, 2018
6786ecc
Change test case for a one with known global minimum
Goneiross Nov 8, 2018
1aec29b
Need to correct NNMF to make test II work
Goneiross Nov 8, 2018
f67564a
Change error type
Goneiross Nov 9, 2018
e32fa91
Large fix
Goneiross Nov 9, 2018
af2e2fb
Remove debug from NNMF
Goneiross Nov 9, 2018
20c0fbf
Remove useless console.log
Goneiross Nov 9, 2018
c8a8233
Change NNMF algorithm to reduce error
Goneiross Nov 11, 2018
391502f
fix for non square matrix
Goneiross Nov 11, 2018
00a9b41
Add new test
Goneiross Nov 11, 2018
481b586
Change an exemple for the one in my pdf
Goneiross Nov 12, 2018
421570e
Remove console.table
Goneiross Nov 12, 2018
086d206
Add initialization for positiveLinearDependencies
Goneiross Nov 12, 2018
27da318
Add JS info for function
Goneiross Nov 12, 2018
f601dd5
Add function to test linear combinations
Goneiross Nov 12, 2018
6988d61
Add a test for positiveLinearCombination
Goneiross Nov 12, 2018
29a5c40
Rename
Goneiross Nov 12, 2018
e309fb9
Moved an example
Goneiross Nov 12, 2018
ab9302b
Small fix for PLC but still not working properly
Goneiross Nov 12, 2018
f83557f
Now function remove some values in nA.X if not usefull
Goneiross Nov 12, 2018
fab98a6
Fix
Goneiross Nov 12, 2018
6909d3d
Fix : NMMF and linear combination now both working
Goneiross Nov 12, 2018
83bdd83
Small fix for end condition + Add base for decimal combination
Goneiross Nov 13, 2018
1ffd24d
small fix
Goneiross Nov 13, 2018
72060b4
Add test for decimal
Goneiross Nov 13, 2018
f9287a1
Add non working test case
Goneiross Nov 27, 2018
3a28b5f
Add prototype of projection function
Goneiross Nov 29, 2018
4a3a447
Revert "Add prototype of projection function"
Goneiross Dec 2, 2018
3165750
Revert "Add non working test case"
Goneiross Dec 2, 2018
e0c4a1d
Remove LinearCombination
Goneiross Dec 4, 2018
16b0181
Add a test comparing Matrix and this algo
Goneiross Dec 10, 2018
4fb8864
Reduce number of rerandomisation to only two, better for little numbe…
Goneiross Dec 10, 2018
bed9cbe
Removed useless comments
Goneiross Dec 10, 2018
52dd5e1
Merge remote-tracking branch 'origin/master' into NNMF
Goneiross Feb 9, 2019
92ecdde
Fix syntax
Goneiross Feb 9, 2019
d5cb7e2
Update test cases
Goneiross Feb 10, 2019
6d0ed02
Update matrix.d.ts
Goneiross Mar 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove useless parameters for NNMF
  • Loading branch information
Goneiross committed Oct 26, 2018
commit 317b29815f6e0299cb6930fc390764a109c7adce
2 changes: 1 addition & 1 deletion src/__tests__/decompositions/nnmf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('Non-negative Matrix Factorization', () => {
[1, 0, 0, 0, 1]
]);

var nA = new NNMF(A, 4, 100);
var nA = new NNMF(A, 4);
var zM = Matrix.zeros(5, 5);

nA.doNnmf(1000);
Expand Down
2 changes: 1 addition & 1 deletion src/dc/nnmf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Matrix, WrapperMatrix2D } from '../index';
* @param {number} it
*/
export default class NNMF {
constructor(A, r, it) {
constructor(A, r) {
A = WrapperMatrix2D.checkMatrix(A);
var m = A.rows;
var n = A.columns;
Expand Down