Skip to content

Commit

Permalink
Merge branch 'main' into fix/image-conversion
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/BodyPix/index.js
#	src/CartoonGAN/index.js
#	src/DCGAN/index.js
#	src/UNET/index.js
  • Loading branch information
lindapaiste committed May 13, 2022
2 parents 99ae749 + b6fd7eb commit a40ac46
Show file tree
Hide file tree
Showing 57 changed files with 46,817 additions and 4,134 deletions.
19 changes: 19 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,25 @@
"contributions": [
"doc"
]
},
{
"login": "yoychen",
"name": "Yong-Yuan Chen",
"avatar_url": "https://avatars.githubusercontent.com/u/3905275?v=4",
"profile": "https://github.com/yoychen",
"contributions": [
"doc"
]
},
{
"login": "adrianfiedler",
"name": "adrianfiedler",
"avatar_url": "https://avatars.githubusercontent.com/u/7136570?v=4",
"profile": "https://github.com/adrianfiedler",
"contributions": [
"doc",
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
15 changes: 15 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ module.exports = {
"no-unused-vars": ["error", { varsIgnorePattern: "^setup$|^draw$|^preload$" }],
"new-cap": 0,
"no-underscore-dangle": 0,
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": ["**/**_test.js", "**/**.test.js", "setupTests.js"]
}
]
},
},
{
Expand All @@ -43,5 +49,14 @@ module.exports = {
ml5: false,
},
},
{
files: ["**/**.test.js"],
globals: {
ml5: false,
},
env: {
jest: true,
}
},
],
};
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,18 @@ Before getting started with ml5.js, review our [Code of Conduct](https://github.








<p id="latest-version">

* You can use the latest version (0.12.0) by adding it to the head section of your HTML document:
* You can use the latest version (0.12.2) by adding it to the head section of your HTML document:

**v0.12.0**
**v0.12.2**

<script src="https://unpkg.com/[email protected].0/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>

</p data-id="latest-version">

Expand Down Expand Up @@ -121,6 +123,8 @@ Before getting started with ml5.js, review our [Code of Conduct](https://github.








Expand Down Expand Up @@ -353,6 +357,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="http://lindapaiste.com"><img src="https://avatars.githubusercontent.com/u/28965286?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lindapaiste</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=lindapaiste" title="Code">💻</a> <a href="#ideas-lindapaiste" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ml5js/ml5-library/issues?q=author%3Alindapaiste" title="Bug reports">🐛</a></td>
<td align="center"><a href="http://evanweinberg.com"><img src="https://avatars.githubusercontent.com/u/1531831?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Evan Weinberg</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=emwdx" title="Documentation">📖</a></td>
<td align="center"><a href="https://youtube.com/codergautam"><img src="https://avatars.githubusercontent.com/u/66850133?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Coder Gautam</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=codergautam" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/yoychen"><img src="https://avatars.githubusercontent.com/u/3905275?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yong-Yuan Chen</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=yoychen" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/adrianfiedler"><img src="https://avatars.githubusercontent.com/u/7136570?v=4?s=100" width="100px;" alt=""/><br /><sub><b>adrianfiedler</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=adrianfiedler" title="Documentation">📖</a> <a href="https://github.com/ml5js/ml5-library/issues?q=author%3Aadrianfiedler" title="Bug reports">🐛</a></td>
</tr>
</table>

Expand Down
5 changes: 0 additions & 5 deletions docs/reference/dcgan.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,17 @@ dcgan.generate(callback, ?latentVector);
## Examples
**p5.js**
* [DCGAN_LatentVector](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/DCGAN/DCGAN_LatentVector)
* [DCGAN_LatentVector_RandomWalk](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/DCGAN/DCGAN_LatentVector_RandomWalk)
* [DCGAN_LatentVector_Slider](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/DCGAN/DCGAN_LatentVector_Slider)
* [DCGAN_Random](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/DCGAN/DCGAN_Random)
**p5 web editor**
* [DCGAN_LatentVector](https://editor.p5js.org/ml5/sketches/DCGAN_LatentVector)
* [DCGAN_LatentVector_RandomWalk](https://editor.p5js.org/ml5/sketches/DCGAN_LatentVector_RandomWalk)
* [DCGAN_LatentVector_Slider](https://editor.p5js.org/ml5/sketches/DCGAN_LatentVector_Slider)
* [DCGAN_Random](https://editor.p5js.org/ml5/sketches/DCGAN_Random)
**plain javascript**
* [DCGAN_LatentVector](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/DCGAN/DCGAN_LatentVector)
* [DCGAN_LatentVector_RandomWalk](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/DCGAN/DCGAN_LatentVector_RandomWalk)
* [DCGAN_LatentVector_Slider](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/DCGAN/DCGAN_LatentVector_Slider)
* [DCGAN_Random](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/DCGAN/DCGAN_Random)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/feature-extractor.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ featureExtractor.load(filesOrPath = null, callback);
```
📥 **Inputs**
* **filesOrPath** - A path to your `model.json` if you are using a string path. If you are using the HTML file input, then select BOTH the `model.json` and the model.weights.bin` files.
* **filesOrPath** - A path to your `model.json` if you are using a string path. If you are using the HTML file input, then select BOTH the `model.json` and the `model.weights.bin` files.
* **callback** - Optional. A function to do after your model has been loaded
📤 **Outputs**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
x1,x2
2.498895550686414,1.1683342316471301
5.073222450036444,0.8623713271387572
4.672790880324094,2.6418773621498803
-4.408037749943782,9.86082022147346
5.017192218165258,1.137014304612439
7.518747899407973,2.824390511479593
4.792308918246223,2.8622728672522513
4.002126494732158,1.0958849986300305
-3.3073314310084383,10.545076592611387
5.791536553548423,1.7584056477819938
-2.4015376967912294,13.417267031869386
5.847853551389746,2.3858087486376407
-0.0017394517573983137,6.508513988309954
5.374516335890133,1.7016671877737757
0.28753386730842045,0.5976310661080595
0.8258255569618576,9.861250091558112
4.940788228589272,1.9900786477623023
3.2890076399871053,0.3427680089978571
3.988136979153767,2.0831095504360073
3.659149016220983,2.2638283536839325
5.555599223424615,1.5565462415023867
5.331463614299523,2.663076891195877
0.11061124930354183,8.610716891335636
3.5267117054448356,1.2209635632529157
-1.9299059971104287,8.325961615386033
-3.4822675166794257,9.212557358542593
5.317971265034728,3.13569806198625
-1.0389200883981988,6.832060008425208
3.4334956025750185,2.6337143742086604
-1.0568289494221548,11.438529736378069
-2.573235731712778,11.811045773821789
6.201764781931517,1.9869105473044737
-4.279755418340924,8.002043735704644
-1.862782678986323,7.861151425884607
-1.0550568568118213,6.814148328994786
4.90717442577531,1.16720379730483
-0.4664317077232183,10.35834677371033
6.769568117034272,0.31104203647088946
-2.3536032633953785,8.479818303259185
3.5756890342821226,1.819102610362172
0.1324993598234938,8.087891657092943
5.19435952201038,1.2162053660265575
4.623433978524807,0.7683444906278196
5.119276056863804,1.0427368394890264
-2.4859570811020197,11.612440305621691
3.5314085391619474,1.5416156329346786
-1.869662066558492,10.0166738139879
-3.9543588097000844,8.117408525307647
-2.0446639199024794,10.41177407996755
5.949260945309115,1.7757023394205802
1.7879305393582672,1.267190514864307
-4.089069692239981,9.289065737747164
-2.715915905562149,8.476071141135273
-3.5828235846721856,8.492891173333659
-0.5732718294706398,10.897929756991946
3.395204839536041,1.893239565009781
-2.3356740405400465,10.745713734983534
-1.9853382359526324,7.737401636763973
4.007372787040974,2.284764276867804
3.3219177453516364,2.59367812101621
4.360414128684593,1.311172411728886
3.620522247090522,2.1751171233989512
4.771037433005142,0.9351790183459179
-2.3884927219010996,6.467585978569685
4.48607575029831,3.635298423296617
-5.28096798228739,9.136840653894229
-2.5333235595461465,7.1236554840598725
5.477941378052291,2.816906447700362
-4.88329547570833,9.366170442700522
-1.894988910294277,5.862897924366712
5.337252718487184,4.031317870054879
-4.319606782133281,9.575995022924285
-1.390833589612127,7.482139396373238
-1.095248689908615,7.3887798179560775
6.575207795662701,0.045106752354580504
-2.9822647961358992,13.87651742675504
0.3136040147838939,10.386055651034626
2.7899566566108462,0.7138665577399477
-1.9170728963920638,10.758047548814568
-3.5847324678941423,12.325184977053594
2.9467750717836854,3.2056665465233616
5.643338045641777,2.792769450086803
5.748240571581146,3.06554319094667
6.392864172583703,2.001373455758078
4.300732567903952,0.2976575201672953
7.747981781915266,-0.5341774164198156
-7.191923534292956,10.483415375827304
6.341075864336601,1.0229174167894692
3.5358085987171015,2.300390705118297
3.5123078117936952,1.16831056832389
-2.5000574529353314,8.594967757802493
-2.331073412167549,8.114336553895091
-2.8530378205916285,9.55329412222294
-2.01462005006607,10.492854568905733
4.9688177701254315,1.2924508948489057
-0.6663129199069588,10.678925003789821
-1.5762407145153619,9.545138470443067
7.489491311307935,3.359554857046623
-3.7640991814652858,8.428598604014903
3.6021360086725087,1.6551717641611556
2.867081422900716,4.432436232802504
-5.039135836302563,8.262393606563183
7.504097088748158,-0.6480764589214596
-3.210080699736075,6.398291404739583
-4.4233899774901975,9.876692961897861
4.6143440413131485,0.6269821657329229
5.92090392303617,2.8478520652338064
1.9205353746682805,2.2235388802078906
5.916099516741989,1.1985085838723482
-5.382531896151638,9.344314325251442
5.731382862945856,2.8186296953863046
-3.332577388178688,10.903864481579097
3.0281314916384234,1.5240043982168021
-0.8729402600460268,9.601920145396827
7.531153098078045,0.94278219832302
3.54117937687979,4.782808716112358
-2.076696385876665,5.594347691005941
-5.152017042325083,7.727583417524748
-1.1892079098050659,9.320602452423994
6.355515899671174,1.178812882165293
-1.4602059043380013,12.929668315720823
5.566598052820089,1.4344144011991713
7.580326747295009,0.88779393225191
-4.022819264671252,6.306536301876362
-4.0092770143746534,8.461577087072836
5.235835618725371,3.0133414042793527
-2.199641243865366,9.703030874887844
-3.9092424141895945,8.43860958447838
-3.71917800846229,10.107641509443175
5.406465538689504,3.4979971302360946
-4.132266928473025,6.489830170075205
4.493836675773335,2.5125846131011667
6.588461571903373,3.2612700211546333
-0.43823830338587655,7.547337931199005
4.006172922387083,3.4354028646236925
4.701072297710841,1.0982065299948878
-3.456130142957489,9.931738251568461
2.599682353358936,1.3229444758053233
4.6469200295924455,2.0362548075839046
-5.592443171048769,8.009211864051997
5.811223232162794,2.2193596993098295
-2.102618934203611,11.350769641656404
-4.099181420150744,7.556046563555148
-2.135859405255648,5.511426994212602
-2.0614481992390097,9.633553248874154
2.695404056140095,0.08323984025990727
4.733608455402291,1.455774011567132
6.8318662227801354,0.0527885557743113
-3.3657090508454783,8.682425559274737
5.057362751300872,3.95426489593516
-0.7871879681286511,9.752121247811193
5.098785722242711,4.492475207415714
4.216538097313219,2.9923068058753794
4.770124155712477,2.7723412466672896
5.075166532464861,1.7984147475259649
0.8623103832895089,9.326339406358505
-2.908631512025264,10.290543352270916
-4.251415637034008,10.421179288349352
-4.486742477016456,6.876098048359911
-1.039786570124375,12.404754015423718
-2.40515106001055,6.9712565902963615
4.615019561801917,1.5855614298148957
-2.345177632998176,5.461558634883256
5.331480290553087,7.1465832782640435
-3.7247240416529084,9.429433542341522
-4.152644414249167,11.784753372422884
4.436063160005282,2.763156798585049
6.223620544943163,1.3431647893324377
4.61181236167117,2.130715851190733
-1.9798903663699576,9.480915605010487
4.726193474411028,0.5259835774407624
2.3394970205731256,3.791137471853162
-2.571244004271286,6.9253046772491675
4.048991011549115,2.1487269688182726
-5.938951026769725,8.966893268725231
-4.5665685635508755,9.685836517800121
-3.12179086511768,7.580236475536232
7.010515094939672,2.5169755250744155
-3.34837081904391,9.984098027278629
3.751237854712379,3.1178095876521947
6.194979821394534,3.0362073114008474
4.347578451751273,3.4485974725075152
-2.9018553818331365,9.65261551728166
-4.720214693268204,6.654004440065657
-2.126510650374437,6.787560616390087
-1.66329773634057,8.884106350076632
-1.8632124226297475,11.763486296940535
-2.6379138335227577,10.80807495765536
3.6793753745849576,2.8857274994901103
-3.337544638368226,8.181806364699831
3.675158323001068,1.6865547461974304
-2.797491617744138,9.73651647561285
-2.927740661193968,8.595772436399358
5.561382918912847,-0.19237085062054904
-4.638621491731087,10.187858545785165
-2.6470149137161436,9.624086367790616
3.848485080139458,3.114007826737761
-2.947822467631406,7.667002431946508
4.741668523057394,1.0638829577856557
-2.04883303025143,8.88121599927623
Loading

0 comments on commit a40ac46

Please sign in to comment.