Merge pull request #3 from virtual-labs/dev

Dev
virtual-labs · Aug 27, 2021 · 3dc4935 · 3dc4935
2 parents d4742f6 + 81a6572
commit 3dc4935
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/deployment-script.yml b/.github/workflows/deployment-script.yml
@@ -15,13 +15,13 @@ jobs:
     - name: Setup node
       uses: actions/setup-node@v2
       with:
-            node-version: '12'
+            node-version: '16'
             check-latest: true
     - run: |
-        git clone -b pipeline-new https://github.com/virtual-labs/ph3-lab-mgmt
+        git clone --depth=1 https://github.com/virtual-labs/ph3-lab-mgmt
         cd ph3-lab-mgmt
         npm install
-        node exp.js
+        npm run build-exp
         cd ../
         git config --local user.email "admin@vlabs.ac.in"
         git config --local user.name "vleadadmin"

diff --git a/experiment-descriptor.json b/experiment-descriptor.json
@@ -13,6 +13,13 @@
       "unit-type": "task",
       "content-type": "text"
     },
+    {
+      "target": "objective.html",
+      "source": "objective.md",
+      "label": "Objective",
+      "unit-type": "task",
+      "content-type": "text"
+    },
     {
       "target": "procedure.html",
       "source": "procedure.md",

diff --git a/experiment/experiment-name.md b/experiment/experiment-name.md
@@ -1 +1 @@
-### Single Cycle
+## Single Cycle
diff --git a/experiment/simulation/index.html b/experiment/simulation/index.html
@@ -7,7 +7,8 @@
 <body>
 		<!-- Your code goes here-->
 
-	<p><a href="./v19.swf">Click Here<script type="text/javascript"> 
+	<p><li>Make sure that you have<a href="../../../Introduction.html"> prerequisites</a> installed to run experiment</li> </p>	
+	<p>Click <a href="./v19.swf">here<script type="text/javascript"> 
 AC_AX_RunContent( 'width','100%','height','100%','src','v19.swf','movie','v19.swf' ); //end AC code
 </script><noscript><object height="100%" width="100%">
 <param name="movie" value="v19.swf"></param>

diff --git a/experiment/theory.md b/experiment/theory.md
@@ -1,4 +1,4 @@
-- In Single Cycle CPU design approach each instruction takes exactly one clock cycle to execute.  
-- In Multicycle CPU each instruction multiple clock cycles to execute.  
-- In Pipelined approach instruction execution takes place in a overlapped fashion.  
-- The instructions supported by the Single Cycle cpu in our experiment and how to microcode new instructions are all given as a part of the experiment itself.  
+1 In Single Cycle CPU design approach each instruction takes exactly one clock cycle to execute.  
+2 In Multicycle CPU each instruction multiple clock cycles to execute.  
+3 In Pipelined approach instruction execution takes place in a overlapped fashion.  
+4 The instructions supported by the Single Cycle cpu in our experiment and how to microcode new instructions are all given as a part of the experiment itself.