From fac657d6e42beb6e84e26d394d2833621b6f582f Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 30 Jun 2020 23:12:06 +0530 Subject: [PATCH 01/13] edited basiccontrolflow.js --- .../simulation/IfElse/basicControlFlow.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lab/exp6/simulation/IfElse/basicControlFlow.js b/src/lab/exp6/simulation/IfElse/basicControlFlow.js index 44d45ecc..8e5be1c5 100644 --- a/src/lab/exp6/simulation/IfElse/basicControlFlow.js +++ b/src/lab/exp6/simulation/IfElse/basicControlFlow.js @@ -262,14 +262,14 @@ window.view = { displayFigures: function () { this.drawDots(); this.drawFillRectangle(); - this.drawCircle(75, 75, '#000000'); - this.drawCircle(275, 75, '#000000'); - this.drawCircle(75, 325, '#000000'); - this.drawCircle(275, 325, '#000000'); - this.displayText('(x1, y1)', 65, 65); - this.displayText('(x2, y2)', 265, 65); - this.displayText('(x3, y3)', 265, 345); - this.displayText('(x4, y4)', 75, 345); + this.drawCircle(50,50, '#000000'); + this.drawCircle(250,50, '#000000'); + this.drawCircle(250,300, '#000000'); + this.drawCircle(50,300, '#000000'); + this.displayText('(x1, y1)', 40,40); + this.displayText('(x2, y2)', 240,40); + this.displayText('(x3, y3)', 240,290); + this.displayText('(x4, y4)', 40,290); this.canvasContext.save(); }, /* validationInput: check validation of input that is given by user and if input value is valid @@ -355,7 +355,7 @@ window.view = { if (this.nextSiblingElement.id === 'codeContentIfElse4Id' || this.nextOfnextSiblingElement.id === 'codeContentIfElse6Id') { if (this.nextSiblingElement.id === 'codeContentIfElse4Id') this.codeExecutionWithColour(); - else if (model.valueOfX >= 75) + else if (model.valueOfX >= 50) this.changeFlagValue('flagValue1', 'codeContentIfElse6Id', '1'); else this.codeExecutionWithColourAndId('codeContentIfElse8Id'); @@ -363,7 +363,7 @@ window.view = { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse8Id' || this.nextOfnextSiblingElement.id === 'codeContentIfElse10Id') { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse8Id') this.codeExecutionWithColourAndId('codeContentIfElse8Id'); - else if (model.valueOfX <= 275) + else if (model.valueOfX <= 250) this.changeFlagValue('flagValue2', 'codeContentIfElse10Id', '1'); else this.codeExecutionWithColourAndId('codeContentIfElse12Id'); @@ -371,7 +371,7 @@ window.view = { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse12Id' || this.nextOfnextSiblingElement.id === 'codeContentIfElse14Id') { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse12Id') this.codeExecutionWithColourAndId('codeContentIfElse12Id'); - else if (model.valueOfY >= 75) + else if (model.valueOfY >= 50) this.changeFlagValue('flagValue3', 'codeContentIfElse14Id', '1'); else this.codeExecutionWithColourAndId('codeContentIfElse16Id'); @@ -379,7 +379,7 @@ window.view = { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse16Id' || this.nextOfnextSiblingElement.id === 'codeContentIfElse18Id') { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse16Id') this.codeExecutionWithColourAndId('codeContentIfElse16Id'); - else if (model.valueOfY <= 325) + else if (model.valueOfY <= 300) this.changeFlagValue('flagValue4', 'codeContentIfElse18Id', '1'); else this.codeExecutionWithColourAndId('codeContentIfElse20Id'); @@ -387,7 +387,7 @@ window.view = { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse20Id' || this.nextOfnextSiblingElement.id === 'codeContentIfElse22Id') { if (this.nextOfnextSiblingElement.id === 'codeContentIfElse20Id') this.codeExecutionWithColourAndId('codeContentIfElse20Id'); - else if (model.valueOfX > 75 && model.valueOfX < 275 && model.valueOfY > 75 && model.valueOfY < 325) { + else if (model.valueOfX > 50 && model.valueOfX < 250 && model.valueOfY > 50 && model.valueOfY < 300) { this.codeExecutionWithColourAndId('codeContentIfElse22Id'); this.displayTextWithColour('Output: INSIDE', 100, 40, '#FF2400'); } From f9c72521e6421235988c6147674d27d4433830fa Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 30 Jun 2020 23:15:55 +0530 Subject: [PATCH 02/13] edited index.html and basiccontrolflow.js for the expected output --- src/lab/exp6/simulation/IfElse/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lab/exp6/simulation/IfElse/index.html b/src/lab/exp6/simulation/IfElse/index.html index 46080f90..84067beb 100644 --- a/src/lab/exp6/simulation/IfElse/index.html +++ b/src/lab/exp6/simulation/IfElse/index.html @@ -14,10 +14,10 @@
Initialize
-
x1 = 075;   y1 = 075;
-
x2 = 275;   y2 = 075;
-
x3 = 275;   y3 = 325;
-
x4 = 075;   y4 = 325;
+
x1 = 050;   y1 = 050;
+
x2 = 250;   y2 = 050;
+
x3 = 250  y3 = 300/div> +
x4 = 050  y4 = 300/div>
@@ -125,4 +125,4 @@
- \ No newline at end of file + From cf447473a435c183ebc3bdf729352300d7ae4595 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 30 Jun 2020 23:34:17 +0530 Subject: [PATCH 03/13] edited basiccontrolflow.js in switch case --- src/lab/exp6/simulation/SwitchCase/basicControlFlow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js b/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js index 6822a81c..ec474fcf 100644 --- a/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js +++ b/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js @@ -221,7 +221,7 @@ window.view = { this.codeExecutionWithColour(); if (this.currentSiblingElement.className === 'break redClass') this.codeExecutionWithColourAndId('closeBrc1Id'); - if (1 <= model.inputNumber && model.inputNumber <= 6) { + if (1 <= model.inputNumber && model.inputNumber <= 5) { if (this.nextSiblingElement.id === 'holidayId') this.codeExecutionWithColourAndId('elseIfId'); else if (this.nextSiblingElement.id === 'workingdayId') { @@ -240,7 +240,7 @@ window.view = { this.setInnerHtml('outputDayId', 'INVALID INPUT'); } } - if (model.inputNumber === 7) { + if (model.inputNumber === 6 || model.inputNumber === 7) { if (this.nextSiblingElement.id === 'holidayId') { this.codeExecutionWithColour(); this.changeOpacity('holidayImage'); From 60ed03d295040c6c99045c7b0371b825db2344a2 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 30 Jun 2020 23:37:18 +0530 Subject: [PATCH 04/13] edited index.html and js file in switch case of exp6 simulation --- src/lab/exp6/simulation/SwitchCase/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lab/exp6/simulation/SwitchCase/index.html b/src/lab/exp6/simulation/SwitchCase/index.html index 4af5361f..d19eac98 100644 --- a/src/lab/exp6/simulation/SwitchCase/index.html +++ b/src/lab/exp6/simulation/SwitchCase/index.html @@ -54,7 +54,7 @@
  default : str = null;
   break;
 }
-
 if ( strcmp( str, 'Sunday' ) == 0 ) {
+
 if ( strcmp( str, 'Saturday' ) == 0 || strcmp( str, 'Sunday') == 0 ) {
  printf ( 'HOLIDAY' ); }
 else if ( str != null ) {
  printf ( 'WORKING DAY' ); }
@@ -88,4 +88,4 @@
- \ No newline at end of file + From 73e8d94a2be9c7df532a53e6bae66b37b1ff8847 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 30 Jun 2020 23:50:39 +0530 Subject: [PATCH 05/13] edited index.html in exp10 for adding a*(b+c) in dropdown menu --- src/lab/exp10/simulation/index.htm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lab/exp10/simulation/index.htm b/src/lab/exp10/simulation/index.htm index 3e03797c..3e9c2158 100644 --- a/src/lab/exp10/simulation/index.htm +++ b/src/lab/exp10/simulation/index.htm @@ -40,6 +40,7 @@ + @@ -77,4 +78,4 @@
- \ No newline at end of file + From 18dc939a7aab6581146d48d56d6be90b254b546a Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Thu, 2 Jul 2020 17:01:48 +0530 Subject: [PATCH 06/13] edited basiccontrolflow.js for the input=0 in exp6 --- src/lab/exp6/simulation/SwitchCase/basicControlFlow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js b/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js index ec474fcf..e5f61028 100644 --- a/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js +++ b/src/lab/exp6/simulation/SwitchCase/basicControlFlow.js @@ -230,7 +230,7 @@ window.view = { this.setInnerHtml('outputDayId', 'WORKING DAY'); } } - if ( model.inputNumber > 7 ) { + if ( model.inputNumber <=0 || model.inputNumber >7 ) { if (this.nextSiblingElement.id === 'holidayId') this.codeExecutionWithColourAndId('elseIfId'); else if (this.nextSiblingElement.id === 'workingdayId') From 42f7937bceb1fd57b4f29e32aeecf9c8e93a150d Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Thu, 2 Jul 2020 18:11:45 +0530 Subject: [PATCH 07/13] updated index.html for radiobuttons in exp4 --- src/lab/exp4/simulation/1-D/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lab/exp4/simulation/1-D/index.html b/src/lab/exp4/simulation/1-D/index.html index a6a25b17..de0e3de5 100644 --- a/src/lab/exp4/simulation/1-D/index.html +++ b/src/lab/exp4/simulation/1-D/index.html @@ -20,7 +20,7 @@
-
+
@@ -71,4 +71,4 @@
- \ No newline at end of file + From bed25898d97d166bd9092a7f7386d27db78182a7 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Thu, 2 Jul 2020 22:49:37 +0530 Subject: [PATCH 08/13] edited exp2 in index.html for changing rectangle to right angle triangle --- src/lab/exp2/simulation/function.js | 18 +++++++++--------- src/lab/exp2/simulation/index.html | 6 +++--- src/lab/exp2/simulation/rectangle.jpg | Bin 3556 -> 4738 bytes 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lab/exp2/simulation/function.js b/src/lab/exp2/simulation/function.js index 9d494050..11c2b728 100644 --- a/src/lab/exp2/simulation/function.js +++ b/src/lab/exp2/simulation/function.js @@ -178,13 +178,13 @@ window.view = { options4[i].checked = false } if ( a !== '2') - alert('Incorrect value of input variables(arguments). Calculating the area of a rectangle requires the length of the two different parallel sides of the rectangle. Try again.') + alert('Incorrect value of input variables(arguments). Calculating the area of a right angle triangle requires the length of the two adjacent sides other than hypotenuese. Try again.') else if ( b !== 'float' ) - alert('Incorrect datatype of input variables(arguments). The value of the sides of a rectangle need not be integers. Try again.') + alert('Incorrect datatype of input variables(arguments). The value of the sides of a right angle triangle need not be integers. Try again.') else if ( c !== 'float' ) - alert('Incorrect datatype for return type. The value of the area of a rectangle need not be an integer. Try again.') - else if ( d !== 'a*b' ) - alert('Incorrect formula for calculating the area of a rectangle. Try again.') + alert('Incorrect datatype for return type. The value of the area of a right angle triangle need not be an integer. Try again.') + else if ( d !== '0.5*a*b' ) + alert('Incorrect formula for calculating the area of a right angle triangle. Try again.') else this.approveRectangleInputs() }, @@ -268,7 +268,7 @@ window.view = { document.getElementById('functionSquare').innerHTML += 'float area_sq (float a)
{
  float area = a*a;
  return area;
}' }, displayFunctionForRectangle: function() { - document.getElementById('functionRectangle').innerHTML += 'float area_rect (float a,float b)
{
  float area = a*b;
  return area;
}' + document.getElementById('functionRectangle').innerHTML += 'float area_rightangletri (float a,float b)
{
  float area = 0.5*a*b;
  return area;
}' }, displayFunctionForTriangle: function() { document.getElementById('functionTriangle').innerHTML += 'float area_triangle (float a)
{
 float area = (sqrt(3)/4.0)*a*a;
 return area;
}' @@ -318,8 +318,8 @@ window.view = { alert( 'area from function call ' + String( i + 1 ) + ' ) : ' + functionCall + ' is ' + this.area ) this.correctInputs ++ }, - area_rect: function( param, functionCall ) { - this.area = Number(param[0]) * Number(param[1]) + area_rightangletri: function( param, functionCall ) { + this.area = Number(0.5*param[0]) * Number(param[1]) this.totalArea += this.area alert( 'area from function call ' + String( i + 1 ) + ' ) : ' + functionCall + ' is ' + this.area ) this.correctInputs ++ @@ -367,7 +367,7 @@ window.view = { alert( 'Incorrect function call at line ' + String( i + 1 ) ) } else if ( parameter.length === 2 && functionCall === 'area_rect()' && isNaN(parameter[0]) === false && isNaN(parameter[1]) === false ) - this.area_rect(parameter, parsedValue) + this.area_rightangletri(parameter, parsedValue) else alert( 'Incorrect function call at line ' + String( i + 1 ) ) } diff --git a/src/lab/exp2/simulation/index.html b/src/lab/exp2/simulation/index.html index 5732a2ea..20cbe797 100644 --- a/src/lab/exp2/simulation/index.html +++ b/src/lab/exp2/simulation/index.html @@ -56,10 +56,10 @@
-
4. Choose formula for area of the rectangle :
+
4. Choose formula for area of the right angle triangle :
-
+
@@ -119,7 +119,7 @@
Step Execution
//function for square
-
//function for rectangle
+
//function for right angle triangle
//function for triangle
//function for circle
diff --git a/src/lab/exp2/simulation/rectangle.jpg b/src/lab/exp2/simulation/rectangle.jpg index 706279ed60afed225a0374ca4fa9dcd5ae6f50ef..ff6b97ad43eff69ea5ece65e0f4aa455e4eb160e 100644 GIT binary patch literal 4738 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 LxPQ3F?DqZ-bKT1q literal 3556 zcmex=;s;sz?%DgbmoGcyy=v8*gCK-INCc?K3i zRv|@0M>gTWM0TY@5u?V53ptdXHXalWy7)oGIH{I3zSIJR&kGIVCkMJtH%#xTLhKyrQzIxuvzOy`!^h(&Q;qr%j(RbJn88 zOO`HMzGCI7O`ErD-L`$l&RvHNA31vL_=%IJE?vHI_1g6tH*Y!VdBmBU3pLGYhh?DjKp0IR>&P778mF zHFAhJOe65s#Tv{X+W+x2{AXx7Q+H|p2fz2XUmud={9*Y~`Jcdl2A-_>{BOSQUTy!w z{mWkGvwJ27URhXKb9!}Vie%qC(OVK4Hzyc*+Ux&kIDFdv!KU~xdUY4%eS3~g%H|1(TA{c9iS zAb*Dc4;DF-dJOyGFMkyoHGL{=L&o%(ywrb&2M^}|&&#=5UY5($9{}SpSe9iyqmETbR zW@_gBU**@df7M~=MmG)2-#)-sUeJd>bm`BmHO}N`bSj|2oEd?`xo;+%BjI5Y7-!@XUg>Z$4Ke};p=vghH4`mJ`2AC3PB=>G_>zfmW;{loEZ`QPq;+duzl zTwKi0fB82b+@8Pn?ad93PoI0dn}PYaEtcj4^BFtSe@Eh3|1)Izi$=fRFSt+OkN(Gh z+cPt^31rEsd|2DJx}0~{?p=pAofqD9OwLn6!Gg`r; Date: Thu, 2 Jul 2020 23:18:35 +0530 Subject: [PATCH 09/13] edited index.html for the arrow below key element in exp4 --- src/lab/exp4/simulation/1-D/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lab/exp4/simulation/1-D/index.html b/src/lab/exp4/simulation/1-D/index.html index de0e3de5..baa0a80e 100644 --- a/src/lab/exp4/simulation/1-D/index.html +++ b/src/lab/exp4/simulation/1-D/index.html @@ -65,7 +65,7 @@
-
0
+
0
Key Value
From 223070da082b3326d92627229033df288f3f8d8c Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 7 Jul 2020 22:59:43 +0530 Subject: [PATCH 10/13] changed index.html of exp1 for limits --- src/lab/exp1/simulation/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lab/exp1/simulation/index.html b/src/lab/exp1/simulation/index.html index d6ceab13..dea2f9d0 100644 --- a/src/lab/exp1/simulation/index.html +++ b/src/lab/exp1/simulation/index.html @@ -24,7 +24,7 @@


1. Given a well-behaved smooth function, integrate it over the given limits of integration ?


2. Approximating solution to integral a smooth function.


-

3. Integration Limits are from 0 to 30, b > a and b-a >= 1.


+

3. Integration Limits are from 0 to 10, b > a and b-a >= 1.


From 4a2d8805684be23dce14e892bb65f4d6af9cb009 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Tue, 7 Jul 2020 23:03:05 +0530 Subject: [PATCH 11/13] updated js file and index.html in exp1 for changing the limits of a,b to [1,10] --- src/lab/exp1/simulation/numericalApproximation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lab/exp1/simulation/numericalApproximation.js b/src/lab/exp1/simulation/numericalApproximation.js index 5ca76384..24923f7c 100644 --- a/src/lab/exp1/simulation/numericalApproximation.js +++ b/src/lab/exp1/simulation/numericalApproximation.js @@ -290,8 +290,8 @@ window.view = { alert('Enter numeric value of a and b'); return false; } - else if (valueA2 >= valueB2 || valueB2 > 30) { - alert('Integration Limits are from 0 to 30, b > a and b-a >= 1'); + else if (valueA2 >= valueB2 || valueB2 > 10) { + alert('Integration Limits are from 0 to 10, b > a and b-a >= 1'); return false; } else { From b646823b07756f028e81a43ce2289cbaf39ece1a Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Wed, 8 Jul 2020 10:28:30 +0530 Subject: [PATCH 12/13] updated recursion.js in exp9 to change the limit of input to [1,10] --- src/lab/exp9/simulation/JS/recursion.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lab/exp9/simulation/JS/recursion.js b/src/lab/exp9/simulation/JS/recursion.js index 1417a55b..ac63f467 100644 --- a/src/lab/exp9/simulation/JS/recursion.js +++ b/src/lab/exp9/simulation/JS/recursion.js @@ -23,8 +23,8 @@ window.view = { alert('Enter number of disks first !') else if ( isNaN(input) === true ) alert('Number of disks must be an integer value !') - else if ( input > 5 || input % 1 !== 0 ) - alert('Only integral value (Greater than equal to 1 and less than equal to 5) is accepted !') + else if ( input > 10 || input % 1 !== 0 ) + alert('Only integral value (Greater than equal to 1 and less than equal to 10) is accepted !') else { this.disableElement('btnOk') this.enableElement('btnStart') @@ -290,4 +290,4 @@ window.view = { this.activateEvents() } } -window.onload = function() { view.init() } \ No newline at end of file +window.onload = function() { view.init() } From eecedfa1f1db52aa759eddd5fba1c4a8f61451a6 Mon Sep 17 00:00:00 2001 From: SaiShivaniL Date: Wed, 8 Jul 2020 11:07:12 +0530 Subject: [PATCH 13/13] updated advControlFlow.js of exp3 to change the limit of input to [0,20] --- src/lab/exp3/simulation/advControlFlow.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lab/exp3/simulation/advControlFlow.js b/src/lab/exp3/simulation/advControlFlow.js index 9f83de25..1d6b7aab 100644 --- a/src/lab/exp3/simulation/advControlFlow.js +++ b/src/lab/exp3/simulation/advControlFlow.js @@ -35,11 +35,21 @@ window.view = { getInput: function() { var inputValue = document.getElementById('simpleLoopInput').value model.inp = Number(inputValue) + if(inputValue<0||inputValue>20) + { + alert('Invalid input!!The range of input is [0,20]'); + return false; + } this.clearExecutionSection() }, getNestedInput: function() { var inputValue = document.getElementById('nestedLoopInput').value model.nestedInp = Number(inputValue) + if(inputValue<0||inputValue>20) + { + alert('Invalid input!!The range of input is [0,20]'); + return false; + } this.clearExecutionSection() }, activateEvents: function() { @@ -377,4 +387,4 @@ window.view = { this.activateEvents() } } -window.onload = function() { view.init() } \ No newline at end of file +window.onload = function() { view.init() }