Merge pull request #2458 from entrylabs/develop

운영반영

Author: prisml

src/class/learning/Regression.js

@@ -84,18 +84,20 @@ class Regression extends LearningBase {
             this.model = model;
             const { acc = [] } = trainHistory?.history || {};
             const accuracy = _max(acc) || 0;
+            const graphPoints = (graphData.originalPoints || []).slice(0, 1000);
             if (inputs.length == 1) {
-                graphData.predictedPoints.map(({ x, y }) => {
-                    const index = graphData.originalPoints.findIndex(
-                        (p) => _floor(p.x, 1) === _floor(x, 1)
-                    );
-                    if (graphData.originalPoints[index]) {
-                        graphData.originalPoints[index].equation = y;
+                graphData.predictedPoints.map(({ x, y }, i) => {
+                    let index = graphPoints.sort((a, b) => a.x - b.x).findIndex((p) => p.x >= x);
+                    if (index < 0 && i > 0) {
+                        index = graphPoints.length - 1;
+                    }
+                    if (graphPoints[index]) {
+                        graphPoints[index].equation = y;
                     }
                 });
             }
             this.result = {
-                graphData: (graphData.originalPoints || []).slice(0, 1000),
+                graphData: graphPoints,
                 accuracy,
                 normResult,
                 rsquared,

src/css/components/scene.less

@@ -31,15 +31,23 @@ body {
         flex-direction: row-reverse;
         align-items: center;
 
+        .practical_course_mode & {
+            background-color: @basePurple;
+        }
+
         .blockCountView {
             height: 24px;
             line-height: 24px;
             border-radius: 14px;
             margin-right: 12px;
             padding: 0 8px;
-            background-color: #3064ec;
+            background-color: @baseBluePoint;
             font-size: 12px;
             color: #ffffff;
+
+            .practical_course_mode & {
+                background-color: @basePurplePoint;
+            }
         }
     }
 }

src/css/static.less

@@ -26,14 +26,14 @@
 
 @grayFont: #9e9e9f;
 
-@lightHaneul: #42CAF4;
+@lightHaneul: #42caf4;
 
 @lightBora: #6c5af2;
 
 @blueHaneul: #5096f5;
 
 //popup colors
-@titleBack: #2A7DEF;
+@titleBack: #2a7def;
 
 @stepBack: #f4810f;
 
@@ -59,4 +59,6 @@
 
 // 개편 color
 @baseblue: #4f80ff;
+@baseBluePoint: #3064ec;
 @basePurple: #8274ff;
+@basePurplePoint: #5e4dee;

src/playground/block_view.js

@@ -1373,7 +1373,7 @@ Entry.BlockView = class BlockView {
             });
 
             if (images.length) {
-                images.forEach((image) => {
+                Array.from(images).forEach((image) => {
                     const href = image.getAttribute('href');
                     image.setAttribute('href', `${location.protocol}//${location.host}${href}`);
                 });