Merge pull request #2 from virtual-labs/testing

Fixed quiz and updated content
virtual-labs · Mar 25, 2021 · 6378335 · 6378335
2 parents 5fffff1 + 297b9cb
commit 6378335
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 175 deletions.
diff --git a/experiment-descriptor.json b/experiment-descriptor.json
@@ -15,10 +15,10 @@
     },
     {
       "unit-type": "task",
-      "label": "Pre Test Quiz Instructions",
+      "label": "Recap",
       "content-type": "video",
-      "source": "pre-test.md",
-      "target": "pre-test.html"
+      "source": "recap.md",
+      "target": "recap.html"
     },
     {
       "unit-type": "task",
@@ -58,7 +58,7 @@
         },
       	{
          "unit-type": "task",
-         "label": "Infix Quiz",
+         "label": "Quiz",
          "content-type": "assesment",
          "source": "infix-quiz.js",
          "target": "infix-quiz.html"
@@ -74,13 +74,7 @@
         {
           "unit-type": "aim"
         },
-	{
-          "unit-type": "task",
-          "label": "Overview",
-          "content-type": "video",
-          "source": "overview.md",
-          "target": "overview.html"
-        },
+
 	{
           "unit-type": "task",
           "label": "Algorithm for Conversion without Stack",
@@ -99,19 +93,13 @@
         {
           "unit-type": "aim"
         },
-	{
-          "unit-type": "task",
-          "label": "Overview",
-          "content-type": "video",
-          "source": "overview.md",
-          "target": "overview.html"
-        },
+
         {
           "unit-type": "task",
           "label": "Validation of Expressions",
           "content-type": "simulation",
-          "source": "simulation/validation-of-expressions.html",
-          "target": "validation-of-expressions.html"
+          "source": "simulation/demo.html",
+          "target": "demo.html"
         },
         {
           "unit-type": "task",
@@ -120,26 +108,27 @@
           "source": "push-and-pop-operations-on-stack.md",
           "target": "push-and-pop-operations-on-stack.html"
         },
-        {
-          "unit-type": "task",
-          "label": "Push and Pop operations Practice",
-          "content-type": "simulation",
-          "source": "simulation/push-and-pop-operations-practice.html",
-          "target": "push-and-pop-operations-practice.html"
-        },
 	{
           "unit-type": "task",
           "label": "The Whole Conversion",
           "content-type": "video",
           "source": "the-whole-conversion.md",
           "target": "the-whole-conversion.html"
         },
+        {
+          "unit-type": "task",
+          "label": "Push and Pop operations Practice",
+          "content-type": "simulation",
+          "source": "simulation/pushandoutput.html",
+          "target": "pushandoutput.html"
+        },
+
 	{
           "unit-type": "task",
-          "label": "Whole Conversion Exercise",
+          "label": "The Whole Conversion Exercise",
           "content-type": "simulation",
-          "source": "simulation/whole-conversion-exercise.html",
-          "target": "whole-conversion-exercise.html"
+          "source": "simulation/infix_to_postfix.html",
+          "target": "infix_to_postfix.html"
         }
       ]
     },
@@ -152,13 +141,7 @@
         {
           "unit-type": "aim"
         },
-	{
-          "unit-type": "task",
-          "label": "Overview",
-          "content-type": "video",
-          "source": "overview.md",
-          "target": "overview.html"
-        },
+
         {
           "unit-type": "task",
           "label": "Evaluation of Postfix Expression",
@@ -170,8 +153,8 @@
           "unit-type": "task",
           "label": "Push and Pop operations Practice",
           "content-type": "simulation",
-          "source": "simulation/postfix-evaluation-exercise.html",
-          "target": "postfix-evaluation-exercise.html"
+          "source": "simulation/postfix_eval.html",
+          "target": "postfix_eval.html"
         }
 
       ]

diff --git a/experiment/aim.md b/experiment/aim.md
@@ -1,3 +1,6 @@
+### Estimated Time
+1hr 10min
+
 ### Learning Objectives
 
 In this experiment on linked lists we will learn the following topics:

diff --git a/experiment/defining-the-expressions/aim.md b/experiment/defining-the-expressions/aim.md
@@ -1,3 +1,6 @@
+### Estimated Time
+10 minutes
+
 ### Conversion of infix to post fix
 
 This module helps the better understanding of Infix to Postfix conversion of expressions and evaluation of Postfix expression. 
diff --git a/experiment/defining-the-expressions/infix-quiz.js b/experiment/defining-the-expressions/infix-quiz.js
@@ -40,6 +40,7 @@
      function showResults() {
          // gather answer containers from our quiz
          const answerContainers = quizContainer.querySelectorAll(".answers");
+	answerContainers.forEach(e => e.style.color = "black");
 
          // keep track of user's answers
          let numCorrect = 0;

diff --git a/experiment/defining-the-expressions/overview.md b/experiment/defining-the-expressions/overview.md
@@ -1,7 +1,3 @@
-### Estimated Time
-10 minutes
-
-
 ### Basics of Infix and Postfix
 
 <iframe src="https://www.youtube.com/embed/g7YM1tjT1D8" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>

diff --git a/experiment/evaluation-of-postfix-expressions/aim.md b/experiment/evaluation-of-postfix-expressions/aim.md
@@ -1,4 +1,10 @@
+### Evaluation
+
+10 minutes
+
+
 ### Learning Objectives of this Module
 
-Now, that we have converted the infix expression to postfix, how do we evaluate them?
+Now, that we have converted the infix expression to postfix, how to evaluate the post expression 
+
 
diff --git a/experiment/evaluation-of-postfix-expressions/overview.md b/experiment/evaluation-of-postfix-expressions/overview.md
diff --git a/experiment/evaluation-of-postfix-expressions/simulation/postfix-evaluation-exercise.html b/experiment/evaluation-of-postfix-expressions/simulation/postfix-evaluation-exercise.html
diff --git a/...h-stack/simulation/html/postfix_eval.html → ...-expressions/simulation/postfix_eval.html b/...h-stack/simulation/html/postfix_eval.html → ...-expressions/simulation/postfix_eval.html
@@ -4,9 +4,9 @@
       <title>Infix to Postfix</title>
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="stylesheet" type="text/css" href="http://exp-iiith.vlabs.ac.in/styles/common-styles.css">
-      <link rel="stylesheet" href="../css/postfix_evaluation_styles.css">
-      <link rel="stylesheet" href="../css/styles.css">
+    <link rel="stylesheet" href="../../assets/css/common-styles.css">
+      <link rel="stylesheet" href="css/postfix_evaluation_styles.css">
+      <link rel="stylesheet" href="css/styles.css">
       <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.min.js"></script>
@@ -56,10 +56,10 @@
         <button type="reset" class="button-input" id="restart_button">Reset</button>
         <button id="question" class="button-input" name="generate_random_infix" type="button">New Question</button>
         <button type="button" class="button-input" id="check_button">Check</button>
-        <script src="../js/postfix_eval.js"></script>
-        <script src="../js/check_postfix.js"></script>
-        <script src="../js/function_eval_postfix.js"></script>
-        <script src="http://exp-iiith.vlabs.ac.in/styles/instruction-box.js"></script>
+        <script src="js/postfix_eval.js"></script>
+        <script src="js/check_postfix.js"></script>
+        <script src="js/function_eval_postfix.js"></script>
+        <script src="../../assets/js/instruction-box.js"></script>
       </div>
     </div>
   </body>

diff --git a/experiment/infix to-postfix-conversion-with-stack/aim.md b/experiment/infix to-postfix-conversion-with-stack/aim.md
@@ -2,4 +2,14 @@
 
 25 minutes
 
+### Learning Objectives of this Module
+
+In this module, we will be learning about :
+
+   - **Push Operations on Stack** : We will learn about what elements are needed to be pushed on to the stack and how to validate an expression.
+   - **Pop Operations on Stack** : We will learn about what elements are needed to be popped from the stack.
+   - **The Whole Conversion** : We will learn about how to convert a given infix expression into postfix expression using push and pop operations.
+
+
+
 
diff --git a/experiment/infix to-postfix-conversion-with-stack/overview.md b/experiment/infix to-postfix-conversion-with-stack/overview.md
diff --git a/...sion-with-stack/simulation/html/demo.html → ...onversion-with-stack/simulation/demo.html b/...sion-with-stack/simulation/html/demo.html → ...onversion-with-stack/simulation/demo.html
@@ -4,11 +4,11 @@
     <title>Validation of Expression</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" type="text/css" href="http://exp-iiith.vlabs.ac.in/styles/common-styles.css">
-    <script src="http://exp-iiith.vlabs.ac.in/styles/instruction-box.js"></script>
-    <link rel="stylesheet" href="../css/styles.css">
-    <link rel="stylesheet" href="../css/demo_styles.css">
-    <script src="../js/demo.js"></script>
+    <link rel="stylesheet" href="../../assets/css/common-styles.css">
+
+    <link rel="stylesheet" href="css/styles.css">
+    <link rel="stylesheet" href="css/demo_styles.css">
+    <script src="js/demo.js"></script>
   </head>
   <body onload="generate();fun();">
     <div class="instruction-box">
@@ -36,7 +36,7 @@
         <button type="button" class="button-input" id="reset">Reset</button>
         <button type="button" class="button-input" id="pause">Pause</button>
       </div>
-      <script src="http://exp-iiith.vlabs.ac.in/styles/instruction-box.js"></script>
+        <script src="../../assets/js/instruction-box.js"></script>
     </div>
   </body>
 </html>
diff --git a/...ack/simulation/html/infix_to_postfix.html → ...th-stack/simulation/infix_to_postfix.html b/...ack/simulation/html/infix_to_postfix.html → ...th-stack/simulation/infix_to_postfix.html
@@ -4,9 +4,9 @@
       <title>Infix to Postfix</title>
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="stylesheet" type="text/css" href="http://exp-iiith.vlabs.ac.in/styles/common-styles.css">
-      <link rel="stylesheet" href="../css/infix_to_postfix_styles.css">
-      <link rel="stylesheet" href="../css/styles.css">
+    <link rel="stylesheet" href="../../assets/css/common-styles.css">
+      <link rel="stylesheet" href="css/infix_to_postfix_styles.css">
+      <link rel="stylesheet" href="css/styles.css">
       <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.min.js"></script>
@@ -61,9 +61,9 @@
         <button type="reset" class="button-input" id="restart_button">Reset</button>
         <button id="question" class="button-input" name="generate_random_infix" type="button">New Question</button>
         <button type="button" class="button-input" id="check_button">Check</button>
-        <script src="../js/infix_to_postfix.js"></script>
-        <script src="../js/check_postfix.js"></script>
-        <script src="http://exp-iiith.vlabs.ac.in/styles/instruction-box.js"></script>
+        <script src="js/infix_to_postfix.js"></script>
+        <script src="js/check_postfix.js"></script>
+        <script src="../../assets/js/instruction-box.js"></script>
       </div>
     </div>
   </body>

diff --git a/...t/infix to-postfix-conversion-with-stack/simulation/push-and-pop-operations-practice.html b/...t/infix to-postfix-conversion-with-stack/simulation/push-and-pop-operations-practice.html
diff --git a/...-stack/simulation/html/pushandoutput.html → ...-with-stack/simulation/pushandoutput.html b/...-stack/simulation/html/pushandoutput.html → ...-with-stack/simulation/pushandoutput.html
@@ -4,9 +4,9 @@
           <title>Infix to Postfix</title>
           <meta charset="UTF-8">
           <meta name="viewport" content="width=device-width, initial-scale=1.0">
-          <link rel="stylesheet" type="text/css" href="http://exp-iiith.vlabs.ac.in/styles/common-styles.css">
-          <link rel="stylesheet" href="../css/pushandoutput_styles.css">
-          <link rel="stylesheet" href="../css/styles.css">
+    <link rel="stylesheet" href="../../assets/css/common-styles.css">
+          <link rel="stylesheet" href="css/pushandoutput_styles.css">
+          <link rel="stylesheet" href="css/styles.css">
           <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
           <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.js"></script>
           <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/4.4.2/math.min.js"></script>
@@ -74,8 +74,8 @@
             <button type="button" class = "button-input" id="validate_button">Validate</button>
             <button type="button" class = "button-input" id="check_button">Check</button>
           </div>
-            <script src="../js/pushandoutput.js"></script>
-            <script src="http://exp-iiith.vlabs.ac.in/styles/instruction-box.js"></script>
+            <script src="js/pushandoutput.js"></script>
+        <script src="../../assets/js/instruction-box.js"></script>
         </div>
       </body>
     </html>
diff --git a/experiment/infix to-postfix-conversion-with-stack/simulation/validation-of-expressions.html b/experiment/infix to-postfix-conversion-with-stack/simulation/validation-of-expressions.html
diff --git a/experiment/infix to-postfix-conversion-with-stack/simulation/whole-conversion-exercise.html b/experiment/infix to-postfix-conversion-with-stack/simulation/whole-conversion-exercise.html
diff --git a/experiment/infix-to-postfix-conversion-without-stack/aim.md b/experiment/infix-to-postfix-conversion-without-stack/aim.md
@@ -1,3 +1,8 @@
+### Estimated Time
+
+5 minutes
+
+
 ### Learning Objectives of this Module
 
 In this module we will learn how to convert infix expression to postfix expression without using stack.

diff --git a/experiment/infix-to-postfix-conversion-without-stack/overview.md b/experiment/infix-to-postfix-conversion-without-stack/overview.md