Master

src/class/learning/Cluster.js

@@ -2,6 +2,7 @@ import { kmpp } from 'skmeans/kinit';
 // import { kmpp } from 'skmeans/dist/node/kinit';
 import floor from 'lodash/floor';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import LearningView from './LearningView';
 import Chart from './Chart';
 import DataTable from '../DataTable';
@@ -155,7 +156,7 @@ class Cluster {
         this.#isTrained = false;
         const { data, select } = this.#table;
         const filtered = data.filter(
-            (row) => !select.flat().some((selected) => !_toNumber(row[selected]))
+            (row) => !select.flat().some((selected) => _isNaN(_toNumber(row[selected])))
         );
         const [attr] = select;
 

src/class/learning/DecisionTree.js

@@ -4,6 +4,7 @@ import _max from 'lodash/max';
 import _sum from 'lodash/sum';
 import _mean from 'lodash/mean';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import LearningBase from './LearningBase';
 import { DecisionTreeClassifier as DTClassifier } from 'ml-cart';
 import Utils from './Utils';
@@ -159,7 +160,7 @@ function getData(testRate = 0.2, data) {
     const { select = [[0], [1]], data: table, fields } = data;
     const [attr, predict] = select;
     const filtered = table.filter(
-        (row) => !select[0].some((selected) => !_toNumber(row[selected]))
+        (row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
     );
     const dataArray = filtered
         .map((row) => ({

src/class/learning/LearningView.js

@@ -15,7 +15,7 @@ const STATUS = {
 
 export default class LearningView {
     constructor({ name = 'model name', status = STATUS.NO_MODEL, value = 0} = {}) {
-        this.id = Entry.generateHash(); 
+        this.id = Entry.generateHash();
         this.visible = true;
         this.value = value;
         const fontFamily = EntryStatic.fontFamily || 'NanumGothic';

src/class/learning/LogisticRegression.js

@@ -4,6 +4,7 @@ import _max from 'lodash/max';
 import _sum from 'lodash/sum';
 import _mean from 'lodash/mean';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import LearningBase from './LearningBase';
 import Utils from './Utils';
 
@@ -184,7 +185,7 @@ function getData(validationRate, testRate, data, trainParam) {
     const { select = [[0], [1]], data: table, fields } = data;
     const [attr, predict] = select;
     const filtered = table.filter(
-        (row) => !select[0].some((selected) => !_toNumber(row[selected]))
+        (row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
     );
     const dataArray = filtered
         .map((row) => ({

src/class/learning/NumberClassification.js

@@ -6,6 +6,7 @@ import _floor from 'lodash/floor';
 import _sum from 'lodash/sum';
 import _mean from 'lodash/mean';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import DataTable from '../DataTable';
 
 export const classes = [
@@ -334,7 +335,7 @@ function convertTableToKnnData(tableData = {}) {
     const { select = [[0], [1]], data: table = [] } = tableData;
     const [attr, predict] = select;
     const filtered = table.filter(
-        (row) => !select[0].some((selected) => !_toNumber(row[selected]))
+        (row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
     );
     return filtered.reduce(
         (accumulator, row) => {

src/class/learning/Regression.js

@@ -5,6 +5,7 @@ import Chart from './Chart';
 import _sum from 'lodash/sum';
 import _mean from 'lodash/mean';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import LearningBase from './LearningBase';
 import Utils from './Utils';
 
@@ -224,7 +225,7 @@ function convertToTfData(data, trainParam) {
     const [attr, predict] = select;
     const { epochs = 1, batchSize = 1 } = trainParam;
     const filtered = table.filter(
-        (row) => !select.flat().some((selected) => !_toNumber(row[selected]))
+        (row) => !select.flat().some((selected) => _isNaN(_toNumber(row[selected])))
     );
     const totalDataSize = Math.ceil(filtered.length / batchSize) * epochs;
     return filtered.reduce(

src/class/learning/Svm.js

@@ -4,6 +4,7 @@ import _max from 'lodash/max';
 import _sum from 'lodash/sum';
 import _mean from 'lodash/mean';
 import _toNumber from 'lodash/toNumber';
+import _isNaN from 'lodash/isNaN';
 import Utils from './Utils';
 const { callApi } = require('../../util/common');
 const SVM = require('libsvm-js/asm');
@@ -168,7 +169,7 @@ class Svm extends LearningBase {
         const { select = [[0], [1]], data: table, fields } = data;
         const [attr, predict] = select;
         const filtered = table.filter(
-            (row) => !select[0].some((selected) => !_toNumber(row[selected]))
+            (row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
         );
         const dataArray = filtered
             .map((row) => ({

src/playground/blocks/block_ai_utilize_tts.js

@@ -37,6 +37,10 @@ Entry.AI_UTILIZE_BLOCK.tts.getBlocks = function() {
                     [Lang.Blocks.tts_echo, 'brown'],
                     [Lang.Blocks.tts_mischievous, 'minions'],
                     [Lang.Blocks.tts_dainty, 'sally'],
+                    [Lang.Blocks.tts_sabina, 'nsabina'],
+                    [Lang.Blocks.tts_mammon, 'nmammon'],
+                    [Lang.Blocks.tts_kitty, 'nmeow'],
+                    [Lang.Blocks.tts_doggy, 'nwoof'],
                 ],
                 value: 'kyuri',
                 fontSize: 11,

src/playground/blocks/hardware/block_0uboard.js

@@ -313,43 +313,6 @@ Entry.pyocoding.getBlocks = function() {
                 return ANALOG ? ANALOG[port] || 0 : 0;
               },
           },
-          pyocoding_get_touch_value: {
-              color: EntryStatic.colorSet.block.default.HARDWARE,
-              outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
-              skeleton: 'basic_string_field',
-              statements: [],
-              events: {},
-              params: [
-                    {
-                        "type": "Dropdown",
-                        "options": [
-                            [ "A3", "3" ],
-                            //[ "A5", "5" ],
-                        ],
-                        "value": "3",
-                        "fontSize": 11,
-                        bgColor: EntryStatic.colorSet.block.darken.HARDWARE,
-                        arrowColor: EntryStatic.colorSet.arrow.default.HARDWARE,
-                    },
-                ],
-              def: {
-                params: [ null ],
-                "type": "pyocoding_get_touch_value"
-              },
-              isNotFor: [ '0uboard' ],
-              class: "SENSOR",
-              paramsKeyMap: {
-                  "PORT": 0,
-              },
-              func: function (sprite, script) {
-                var port = script.getValue("PORT", script);
-                var ANALOG = Entry.hw.portData.ANALOG;
-                console.log(port,ANALOG)
-                if (port[0] === "A")
-                    port = port.substring(1)
-                return ANALOG ? ANALOG[5] || 0 : 0;
-              },
-          },
           pyocoding_change_4095to255_value: {
               color: EntryStatic.colorSet.block.default.HARDWARE,
               outerLine: EntryStatic.colorSet.block.darken.HARDWARE,

src/playground/blocks/hardware/block_KKMOO.js

@@ -158,7 +158,7 @@ Entry.kkmoo.getBlocks = function() {
             isNotFor: ['kkmoo'],
             func: async function(sprite,script){
                 const wait = (timeToDelay) => new Promise((resolve) => setTimeout(resolve, timeToDelay))
-                await wait(100);
+                await wait(300);
                 await Entry.hw.update();
                 if(Entry.hw.portData.data == 'true'){
                     Entry.kkmoo.isMotionRunning = true;