Merge pull request #526 from HyunjunA/master

remove console.log and comments
EpistasisLab · Jan 10, 2023 · 8580c47 · 8580c47
2 parents 5767eaf + 0094473
commit 8580c47
Show file tree

Hide file tree

Showing 15 changed files with 162 additions and 359 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,6 @@ MANIFEST
 .xz
 *.exe
 *.mp4
-
+package-lock.json
+package.json
+package-copy.json
diff --git a/lab/webapp/src/components/ConfusionMatrixJSONRender/index copy later.jsx b/lab/webapp/src/components/ConfusionMatrixJSONRender/index copy later.jsx
@@ -196,7 +196,7 @@ import d3 from 'd3';
 // test version
 class TestLineChart extends Component {
   componentDidMount() {
-    console.log("hello");
+
     // train_sizes={train_sizes}
     // train_scores={train_scores}
     // test_scores={test_scores}

diff --git a/lab/webapp/src/components/ConfusionMatrixJSONRender/index copy.jsx b/lab/webapp/src/components/ConfusionMatrixJSONRender/index copy.jsx
@@ -196,7 +196,7 @@ import d3 from 'd3';
 // test version
 class TestLineChart extends Component {
   componentDidMount() {
-    console.log("hello");
+
     // train_sizes={train_sizes}
     // train_scores={train_scores}
     // test_scores={test_scores}

diff --git a/lab/webapp/src/components/ConfusionMatrixJSONRender/index.jsx b/lab/webapp/src/components/ConfusionMatrixJSONRender/index.jsx
@@ -198,7 +198,6 @@ import d3 from 'd3';
 // test version
 class ConfusionMatrixJSONRender extends Component {
   componentDidMount() {
-    console.log("hello");
 
     const { cnf_data,chartKey, chartColor, min, max } = this.props;
     this.renderChart(cnf_data, chartKey, chartColor, min, max);

diff --git a/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx b/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx
@@ -45,7 +45,7 @@ const DatasetCard = ({ dataset, recommender, toggleAI }) => {
 			icon_type = "line graph";
 	}
 
-  console.log("DatasetCard refresh");
+  // console.log("DatasetCard refresh");
 
   if (document.getElementById("aiTooglePopup") == null && document.getElementById("aiTooglePopupready") != null) {
 

diff --git a/lab/webapp/src/components/Datasets/index.jsx b/lab/webapp/src/components/Datasets/index.jsx
@@ -70,22 +70,6 @@ class Datasets extends Component {
     const { datasets, recommender, isFetching, error, fetchDatasets, fetchRecommender } = this.props;
 
 
-
-
-
-
-    // React.createElement('div', null, `Hello ${this.props.toWhat}`);
-    console.log("Hello!!!!!!!!!!!!!")
-
-
-
-
-
-
-
-
-
-
     if(isFetching) {
       return (
         <Loader active inverted size="large" content="Retrieving your datasets..." />
@@ -105,8 +89,6 @@ class Datasets extends Component {
 
     if (document.getElementById("aiTooglePopupready") == null) {
 
-      console.log("aiTooglePopupready!!!")
-
       // create a new div element id with aiTooglePopupready
       var temp=document.createElement("div");
       document.body.appendChild(temp);

diff --git a/lab/webapp/src/components/Results/components/ImportanceScoreJSON/index.jsx b/lab/webapp/src/components/Results/components/ImportanceScoreJSON/index.jsx
@@ -80,22 +80,6 @@ function NoScore({ scoreName, scoreValueList, featureList, chartKey, chartColor,
 
       return (
 
-        // <GaugeAll
-        //   expList={scoreValueList}
-        //   chartKey={chartKey}
-        //   chartColor={chartColor}
-        //   min={0.5}
-        //   max={1.0}
-        // />
-
-
-      // <DonutChart
-      //   expList={scoreValueList}
-      //   chartKey={chartKey}
-      //   chartColor={chartColor}
-      //   min={0.5}
-      //   max={1.0}
-      // />
 
       <BarChart
       expList={scoreValueList}
@@ -109,27 +93,26 @@ function NoScore({ scoreName, scoreValueList, featureList, chartKey, chartColor,
 
       );
 
-    } else if (scoreValueList && type == "r2_or_vaf") {
-      return (
-        <GaugeAll
-          expList={scoreValueList}
-          chartKey={chartKey}
-          chartColor={chartColor}
-          min={0}
-          max={1.0}
-        />
-      );
-    } else if (scoreValueList && type == "pearsonr") {
+    } else if (scoreValueList && type == "regression") {
+
+      console.log("scoreValueList && type == regression")
+
       return (
-        <GaugeAll
-          expList={scoreValueList}
-          chartKey={chartKey}
-          chartColor={chartColor}
-          min={-1.0}
-          max={1.0}
-        />
+
+
+      <BarChart
+      expList={scoreValueList}
+      ylist={featureList}
+      chartKey={chartKey}
+      chartColor={chartColor}
+      min={0.5}
+      max={1.0}
+    />
+
+
       );
-    }
+
+    } 
 
   };
 

diff --git a/lab/webapp/src/components/Results/components/LearningCurveJSON/index.jsx b/lab/webapp/src/components/Results/components/LearningCurveJSON/index.jsx
@@ -58,18 +58,7 @@ function foldcheck(fold) {
 
 function NoScore({ scoreName, train_sizes, train_scores, test_scores, chartKey, chartColor, type }) {
   const getCardContent = () => {
-    // if(typeof(scoreValue) !== 'number' && !scoreValueList.length) 
-    // {
-    //   if (scoreName.includes('AUC') ) {
-    //     return (
-    //       <Header inverted size="tiny" content={`${scoreName} is only available for binary classification.`} />
-    //     );
-    //   } else {
-    //     return (
-    //       <Header inverted size="tiny" content={`${scoreName} is not available.`} />
-    //     );
-    //   }
-    // } 
+
 
     if (train_sizes && train_scores && test_scores && type == "classification") {
 

diff --git a/lab/webapp/src/components/Results/components/PCAJSON/index.jsx b/lab/webapp/src/components/Results/components/PCAJSON/index.jsx
@@ -83,27 +83,12 @@ function foldcheck(fold) {
 
     if (Points && Labels && type == "classification") {
 
-      console.log("i am here in no score");
-      console.log('labels', Labels);
+      // console.log("i am here in no score");
+      // console.log('labels', Labels);
 
       return (
 
-        // <GaugeAll
-        //   expList={LabelsList}
-        //   chartKey={chartKey}
-        //   chartColor={chartColor}
-        //   min={0.5}
-        //   max={1.0}
-        // />
 
-
-      // <DonutChart
-      //   expList={LabelsList}
-      //   chartKey={chartKey}
-      //   chartColor={chartColor}
-      //   min={0.5}
-      //   max={1.0}
-      // />
 
 
       // Points, Labels, chartKey, chartColor, type
@@ -118,27 +103,7 @@ function foldcheck(fold) {
       );
 
     } 
-    // else if (LabelsList && type == "r2_or_vaf") {
-    //   return (
-    //     <GaugeAll
-    //       expList={LabelsList}
-    //       chartKey={chartKey}
-    //       chartColor={chartColor}
-    //       min={0}
-    //       max={1.0}
-    //     />
-    //   );
-    // } else if (LabelsList && type == "pearsonr") {
-    //   return (
-    //     <GaugeAll
-    //       expList={LabelsList}
-    //       chartKey={chartKey}
-    //       chartColor={chartColor}
-    //       min={-1.0}
-    //       max={1.0}
-    //     />
-    //   );
-    // }
+
 
   };
 

diff --git a/lab/webapp/src/components/Results/index.jsx b/lab/webapp/src/components/Results/index.jsx
@@ -523,13 +523,31 @@ class Results extends Component {
                   finishTime={experiment.data.finished}
                   launchedBy={experiment.data.launched_by}
                 />
-                <ImportanceScore file={importanceScore} />
+                {/* <ImportanceScore file={importanceScore} /> */}
+                <ImportanceScoreJSON
+                  scoreName="Feature Importance"
+                  scoreValueList={experiment.data.feature_importances}
+                  featureList={experiment.data.feature_names}
+                  chartKey="importance_score"
+                  chartColor="#55D6BE"
+                  type="regression"
+                />
 
               </Grid.Column>
               <Grid.Column>
                 <RegFigure file={reg_cv_pred} />
                 <RegFigure file={reg_cv_resi} />
                 <RegFigure file={reg_cv_qq} />
+
+                {/* <PCAJSON scoreName="PCA 2D"
+                  Points={experiment.data.X_pca}
+                  Labels={experiment.data.y_pca}
+                  chartKey="pca_2d"
+                  chartColor="#55D6BE"
+                  type="classification"
+                /> */}
+
+
               </Grid.Column>
               <Grid.Column>
                 <MSEMAEDetails

diff --git a/lab/webapp/src/components/SceneHeader/index.jsx b/lab/webapp/src/components/SceneHeader/index.jsx
@@ -61,16 +61,6 @@ function SceneHeader({
       fileIcon.parentNode.removeChild(fileIcon); 
     }
 
-    console.log("clearing file icons at the first page");
-
-
-
-
-
-
-
-
-
   }
 
   if (window.location.href.includes("upload_") == false) {

diff --git a/lab/webapp/src/components/TestLineChart/index.jsx b/lab/webapp/src/components/TestLineChart/index.jsx
@@ -196,7 +196,6 @@ import d3 from 'd3';
 // test version
 class TestLineChart extends Component {
   componentDidMount() {
-    console.log("hello");
     // train_sizes={train_sizes}
     // train_scores={train_scores}
     // test_scores={test_scores}

diff --git a/lab/webapp/src/index.jsx b/lab/webapp/src/index.jsx
@@ -41,9 +41,6 @@ configSocket(store);
 *
 */
 
-
-console.log("This is main page!!!")
-
 render(
   <Root store={store} />,
   document.getElementById('app')