Merge branch 'master' into feat/akita

Author: akitaSummer

packages/hedgehog-core/package-lock.json

@@ -22,8 +22,10 @@
     "dependencies": {
         "@babel/core": "^7.10.5",
         "@babel/preset-env": "^7.10.4",
+        "@babel/preset-react": "^7.12.10",
         "@babel/preset-typescript": "^7.10.4",
         "@babel/standalone": "^7.10.5",
+        "@tensorflow/tfjs": "^2.7.0",
         "babel-template": "^6.26.0",
         "clean-webpack-plugin": "^3.0.0",
         "esbuild-loader": "^2.9.1",
@@ -32,6 +34,7 @@
         "nerdamer": "^1.1.5",
         "webpack": "^5.21.2",
         "webpack-cli": "^4.5.0"
+        "sync-fetch": "^0.3.0"
     },
     "devDependencies": {
         "@babel/types": "^7.10.5",

packages/hedgehog-core/package.json

@@ -18,10 +18,12 @@ export function executeOutput(code: string) {
     'prelude',
     preludeImport + code + '\n return _OUTPUT_ITEMS_LIST_;'
   );
+
   const results = fn.call({}, prelude);
 
   console.log('Execution results:');
   console.log(results);
+  console.log('-- End of execution results:');
 
   const returnList = [...results];
   prelude._OUTPUT_ITEMS_LIST_.length = 0;

packages/hedgehog-core/src/runtime/index.ts

@@ -9,7 +9,35 @@ import { Chol, QR, LU } from '../lib/algebra';
 import { OutputItem } from '../output/output-item';
 import { rawInputsToTex } from '../utilites/process-raw-inputs';
 
-export { Sym, Mat, Scalar, _Mat };
+import * as React from 'react';
+import * as d3 from 'd3';
+
+/*
+Third party libraries
+*/
+
+// synchrounous fetch
+const fetch = require('sync-fetch');
+
+// gpu.js
+import { GPU } from 'gpu.js';
+
+// math.js
+import * as mathjs from 'mathjs';
+
+// ml.js
+
+// tensorflow.js
+import * as tf from '@tensorflow/tfjs';
+
+// opencv.js
+
+// d3.js
+
+//tvm.js
+
+
+export { Sym, Mat, Scalar, _Mat, nerdamer, GPU, mathjs, tf, Chol, React, d3 };
 
 /**
  * wrapper of constructing a Mat object
@@ -248,6 +276,18 @@ export function draw(data: any, layout?: any) {
 
 // plot2D is a wrapper for draw() function for scatter plot on 2D only
 export function plot2D(x_: any, y_: any) {
+  if (x_ instanceof Mat && y_ instanceof Mat) {
+    draw([
+      {
+        x: x_.toArray(),
+        y: y_.toArray(),
+        type: 'scatter',
+        mode: 'markers',
+        marker: { color: 'blue', size: '2' },
+      },
+    ]);
+    return;
+  }
   draw([
     {
       x: x_,
@@ -260,6 +300,18 @@ export function plot2D(x_: any, y_: any) {
 }
 
 export function plot2DLine(x_: any, y_: any) {
+  if (x_ instanceof Mat && y_ instanceof Mat) {
+    draw([
+      {
+        x: x_.toArray(),
+        y: y_.toArray(),
+        type: 'scatter',
+        mode: 'lines+markers',
+        marker: { color: 'blue', size: '4' },
+      },
+    ]);
+    return;
+  }
   draw([
     {
       x: x_,
@@ -273,6 +325,23 @@ export function plot2DLine(x_: any, y_: any) {
 
 // plot3D is a wrapper for draw() function for scatter plot on 3D only
 export function plot3D(x_: any, y_: any, z_: any) {
+  if (x_ instanceof Mat && y_ instanceof Mat && z_ instanceof Mat){
+    draw(
+      [
+        {
+          x: x_.toArray(),
+          y: y_.toArray(),
+          z: z_.toArray(),
+          mode: 'markers',
+          marker: { color: 'blue', size: 2 },
+          opacity: 0.5,
+          type: 'scatter3d',
+        },
+      ],
+      {}
+    );
+    return;
+  }
   draw(
     [
       {
@@ -290,6 +359,23 @@ export function plot3D(x_: any, y_: any, z_: any) {
 }
 
 export function plot3DMesh(x_: any, y_: any, z_: any) {
+  if (x_ instanceof Mat && y_ instanceof Mat && z_ instanceof Mat){
+    draw(
+      [
+        {
+          x: x_.toArray(),
+          y: y_.toArray(),
+          z: z_.toArray(),
+          mode: 'markers',
+          marker: { color: 'blue', size: 2 },
+          opacity: 0.5,
+          type: 'mesh3d',
+        },
+      ],
+      {}
+    );
+    return;
+  }
   draw(
     [
       {
@@ -317,6 +403,16 @@ export function formulaTex(...inputs: any[]) {
   _OUTPUT_ITEMS_LIST_.push({ itemType: 'FORMULA', text: inputTex });
 }
 
-export function markdown(inputMarkdown: string) {
+export function markdown(...inputs: any[]) {
+  const inputMarkdown: string = rawInputsToTex(...inputs);
   _OUTPUT_ITEMS_LIST_.push({ itemType: 'MARKDOWN', text: inputMarkdown });
 }
+
+/*
+Synchrnous get function.
+Input: string, URL
+Output: string, text of URL
+*/
+export function get(input:string):string{
+  return fetch(input).text();
+}

packages/hedgehog-core/src/runtime/prelude.ts

@@ -19,7 +19,7 @@ function invokedTemplate(op: any) {
         return (sym(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
       else if (Array.isArray(LEFT_ARG) && (RIGHT_ARG instanceof Mat))
         return (mat(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
-      else if ( typeof LEFT_ARG === 'number' && (RIGHT_ARG instanceof Mat))
+      else if (  (!isNaN(LEFT_ARG)) && (RIGHT_ARG instanceof Mat))
         return (scalar(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
       else
         return LEFT_ARG ${op} RIGHT_ARG;