Merge branch 'master' into ding/mark-region-in-source-2

Author: martin-henz

README.md

@@ -117,8 +117,6 @@ or
 
 where only the part that starts from `Error:` will be compared. Line number is be ignored as it varies. If line number is needed for a particular reason, it can be appended to the back.
 
-> **Note**: for virtual machine tests, you will have to make a function that outputs a single line output without the help of any `displays()`, as the test currently only supports 1 line comparison. Help to make this generic is appreciated.
-
 > Integration of the `test` script with `src/test/framework/` is pending a fix to the `--variant` parameter; any help appreciated.
 
 # License

scripts/test.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-JS_SLANG="node --stack-size=2000 node_modules/js-slang/dist/repl/repl.js"
+JS_SLANG="node --stack-size=4000 node_modules/js-slang/dist/repl/repl.js"
 
 # must use BSD awk
 AWK="awk"
@@ -24,16 +24,31 @@ failed=0
 # $4 is the variant
 
 test_source() {
+    # read in test file to find the number of comment lines
+    IFS=$'\n' read -d '' -r -a lines < $2
+    NUM_VALID_COMMENT=0
+    
+    for ((i=${#lines[@]}-1;i >= 0; i--))
+    do
+        COMMENT=$(echo "${lines[i]}" | grep ^//)
+        if [ -z "$COMMENT" ]
+        then
+            break
+        else
+            ((NUM_VALID_COMMENT++))
+        fi
+    done
+
 
     # if program throws error, ignore the output and compare the error message only
     # NOTE: error output line is striped of line number as it is machine dependent
     ERROR=$( { $JS_SLANG -e --chapter=$3 "$(cat $1 $2)">$DIR/__tests__/output; } 2>&1 )
     if [ ! -z "$ERROR" ]
     then
-        DIFF=$(diff <(echo $ERROR | grep -o 'Error:.*') <(cat $2 | tail -1 | grep -o 'Error:.*'))
+        DIFF=$(diff <(echo $ERROR | grep -o 'Error:.*') <(cat $2 | tail -$NUM_VALID_COMMENT | grep -o 'Error:.*'))
     else 
         DIFF=$(diff <(cat $DIR/__tests__/output) \
-            <(cat $2 | tail -1 | cut -c4-))
+            <(cat $2 | tail -$NUM_VALID_COMMENT | cut -c4-))
     fi
 
     if [ "$DIFF" = "" ]
@@ -43,7 +58,6 @@ $DIFF"
     fi
     # clean up temp file
     rm $DIR/__tests__/output
-    
 }
 
 test_source_framework() {

src/evaluators/__tests__/source-2-non-det.test5.js

@@ -10,7 +10,7 @@ require(! (baker === 5)); \
 require(! (cooper === 1)); \
 require(! (fletcher === 5)); \
 require(! (fletcher === 1)); \
-require(! (miller > cooper)); \
+require( miller > cooper ); \
 require(! ((math_abs(smith - fletcher)) === 1)); \
 require(! ((math_abs(fletcher - cooper)) === 1)); \
 return list(list('baker', baker), \
@@ -28,4 +28,4 @@ function print_one_line_list(li) {
     return result;
 }
 print_one_line_list(result);
-// 'baker1,cooper4,fletcher2,miller3,smith5,'
+// 'baker3,cooper2,fletcher4,miller5,smith1,'

src/evaluators/source-2-non-det.js

@@ -869,7 +869,7 @@ function parse_and_run(str) {
 // require(! (cooper === 1)); \
 // require(! (fletcher === 5)); \
 // require(! (fletcher === 1)); \
-// require(! (miller > cooper)); \
+// require(miller > cooper); \
 // require(! ((math_abs(smith - fletcher)) === 1)); \
 // require(! ((math_abs(fletcher - cooper)) === 1)); \
 // return list(list('baker', baker), \

src/tool-demos/video-filters/README.md

@@ -0,0 +1,36 @@
+Here 13 filters that you can use in your codes and other video and multimedia.
+Brief descriptions for them :-
+
+1. Blur3x3 :- Blurs using a 3*3 mask
+2. Blur5x5 :- Blurs using a 5*5 mask, (277.78%) more effective than 3*3 mask.
+3. Cos_distortion :- Blurs by modifying pixels according to a cosine wave.
+					 [Various parameters like wave-length and distortion constant, can be varied to see various types of effects.]
+4. Sine_distortion :- Same as above, except it uses sine properties. (*2)
+5. Invert :- Inverts the colors, ie, shows the multimedia in the contrast color
+6. Upside down :- Inverts the multimedia upside down.
+7. Motion Detector:- Detects motion in videos and highlights the areas where the motion is happening
+8. Green Background :- Marks sharp contrasts in the background to green them, so that the face and other-contrast-parity objects can be brought to focus
+9. Frame Rate (Continuous) :- Continuously prints the video's Frame Rate
+10. Frame_Rate (Single) :- Prints Frame rate for a video for the initial frame, and then stops.
+11. Ping (Continous) :- Ping is the time between two consecutive frames. Continuously prints the ping for a video. [Has extensive applications in games, etc].
+12.  Ping (Single) :- Prints the initial value of ping and then stops.
+
+Other filters that I have researched can can be added to this collection :-
+1. Converting the video to black and white
+2. Coloring the video (B&W to Color)
+3. Segmentation
+4. Edge detection
+and so on
+
+As per the knowledege I could gain from the Source $4 GPU document(*1), I have tried to bring as many of these filters to Source $4 GPU, however, since I could not find ways to convert all forms of code into this format, some codes are yet on their way to this destination. 
+
+I am sure, with code improvisations, this can be extended to a  library of faster filters catering to all types of requirements.
+
+Further scope of improvement:-
+Undoubtedly, this branch of Source Academy has room for tremendous improvement with various new filters. Apart from that, we can improve the error-handling portion. It's not a big deal to report these errors from console to REPL for the user's consideration, but also to minimum their occurence.
+
+Credits :-
+I would love to thank my professor, batchmates and friends who helped me in this Project, especially who spent the nights together with me to make it work.
+
+(*1) I have added the document along for further consideration by other people.
+(*2) It might feel that the sine and cosine filters are similar, but the images they impact have a significant difference. Feel free to play with them to know the difference.

src/tool-demos/video-filters/blur3x3.js

@@ -0,0 +1,76 @@
+function blur3x3(src, dest)
+{
+    const WIDTH = get_video_width();
+    const HEIGHT = get_video_height();
+    
+    for(let y=0; y<HEIGHT; y = y + 1)
+    {
+        
+        dest[0][y] = src[0][y];
+        dest[WIDTH-1][y] = src[WIDTH-1][y];
+                      
+    }
+
+    for(let x=0; x<WIDTH; x = x + 1)
+    {
+        let r1=src[x][0][0];
+        let g1=src[x][0][1];
+        let b1=src[x][0][2];
+        
+        let new_height = HEIGHT-1;
+        
+        let r2=src[x][new_height][0];
+        let g2=src[x][new_height][1];
+        let b2=src[x][new_height][2];
+        
+        dest[x][0] = [r1,g1,b1];
+        dest[x][new_height] = [r2,b2,g2];
+                      
+    }
+            
+
+    const WIDTH1= WIDTH -2;
+    const HEIGHT1= HEIGHT-2;
+    for(let x=0; x<WIDTH1; x = x + 1)
+    {
+        for (let y=0; y<HEIGHT1; y = y + 1)
+        {
+    
+            let r=src[x][y][0]+
+                  src[x][y+1][0]+
+                  src[x][y+2][0]+
+                  src[x+1][y][0]+
+                  src[x+1][y+1][0]+
+                  src[x+1][y+2][0]+
+                  src[x+2][y][0]+
+                  src[x+2][y+1][0]+
+                  src[x+2][y+2][0];
+                  let g=src[x][y][1]+
+                  src[x][y+1][1]+
+                  src[x][y+2][1]+
+                  src[x+1][y][1]+
+                  src[x+1][y+1][1]+
+                  src[x+1][y+2][1]+
+                  src[x+2][y][1]+
+                  src[x+2][y+1][1]+
+                  src[x+2][y+2][1];
+                  let b=src[x][y][2]+
+                  src[x][y+1][2]+
+                  src[x][y+2][2]+
+                  src[x+1][y][2]+
+                  src[x+1][y+1][2]+
+                  src[x+1][y+2][2]+
+                  src[x+2][y][2]+
+                  src[x+2][y+1][2]+
+                  src[x+2][y+2][2];
+ 
+            r = r/9;
+            b = b/9;
+            g = g/9;
+
+            dest[x][y] = [r,g,b];
+        }
+    }
+}
+
+// apply_filter(blur3x3);

src/tool-demos/video-filters/blur5x5.js

@@ -0,0 +1,52 @@
+function blur5x5(src, dest)
+{
+    const WIDTH = get_video_width();
+    const HEIGHT = get_video_height();
+    
+    for(let y=0; y<HEIGHT; y = y + 1)
+    {
+        dest[0][y] = src[0][y];
+        dest[1][y] = src[1][y];
+        dest[WIDTH-1][y] = src[WIDTH-1][y];
+        dest[WIDTH-2][y] = src[WIDTH-2][y];
+                      
+    }
+
+    for(let x=0; x<WIDTH; x = x + 1)
+    {
+        dest[x][0] = src[x][0];
+        dest[x][1] = src[x][1];
+        dest[x][HEIGHT-1] = src[x][HEIGHT-1];
+        dest[x][HEIGHT-2] = src[x][HEIGHT-2];
+                      
+    }
+    const WIDTH4=WIDTH-4;
+    const HEIGHT4=HEIGHT-4;
+    for(let x=0; x<WIDTH4; x = x + 1)
+    {
+        for (let y=0; y<HEIGHT4; y = y + 1)
+        {
+            let sum1 = 0;
+            let sum2 = 0;
+            let sum3 = 0;
+            
+            for(let i=0; i < 5; i=i+1)
+            {
+              
+              for(let j=0; j < 5; j=j+1)
+              {
+                sum1 = sum1 + (src[x+i][y+j][0]);
+                sum2 = sum2 + (src[x+i][y+j][1]);
+                sum3 = sum3 + (src[x+i][y+j][2]);
+              }
+            }
+            sum1 = sum1 / 9;
+            sum2 = sum2 / 9;
+            sum3 = sum3 / 9;
+            // dest[x][y]=dest[x][y];
+
+            dest[x][y] = [sum1, sum2, sum3];
+        }
+    }
+}
+// apply_filter(blur5x5);

src/tool-demos/video-filters/cos_distortion.js

@@ -0,0 +1,26 @@
+function cos_distortion(src, dest)
+{
+    let wave_length = 5 * (2 * math_PI);
+    let distortion = 10;
+
+    let WIDTH = get_video_width();
+    let HEIGHT = get_video_height();
+
+    let mid_x = WIDTH/2;
+    let mid_y = HEIGHT/2;
+    for(let x=0; x<WIDTH; x = x + 1)
+    {
+        for(let y=0; y<HEIGHT; y = y + 1)
+        {
+            let d_x = math_abs(mid_x - x);
+            let d_y = math_abs(mid_y - y);
+            let d = d_x + d_y; 
+            let s = math_round(distortion * math_cos( d / wave_length));
+            let x_raw =  x + s;
+            let y_raw = y +  s;
+            let x_src = math_max(0,math_min(WIDTH - 1, x_raw));
+            let y_src = math_max(0,math_min(HEIGHT - 1, y_raw));
+            dest[x][y] = src[x_src][y_src];
+        }
+    }
+}

src/tool-demos/video-filters/frame_rate_continuous.js

@@ -0,0 +1,15 @@
+let x=0;
+let ini= runtime();
+
+function framerate_cont(src,dest)
+{
+    let today= runtime();
+    let z=1000.0/(today-ini);
+    display(z);
+    ini=today;
+    x=x+1;
+    
+    
+}
+
+// apply_filter(framerate_cont);

src/tool-demos/video-filters/frame_rate_single.js

@@ -0,0 +1,20 @@
+let x=0;
+let ini= runtime();
+
+function framerate_single(src,dest)
+{
+    let today= runtime();
+    let z=1000.0/(today-ini);
+    if(x===1)
+    {
+        display(z);
+    }
+    else
+    {
+        x=x;
+    }
+    ini=today;
+    x=x+1;    
+}
+
+// apply_filter(framerate_single);