Restore

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/0/d08d4795edf6001d156f96ef84be4885

@@ -0,0 +1,157 @@
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double cx = getX();
+		double cy = getY();
+		if(x > cx - 10 && x < cx + 10 && y > cy - 10 && y < cy + 10) {
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		drawOval(getX(), getY(), radius, radius);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/10/b0899537f9f6001d156f96ef84be4885

@@ -0,0 +1,63 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+        model.clearInvisibles(w, h);
+        model.addBubble(w, h);
+        int prevScore = model.getScore();
+        if (model.getScore() != prevScore) {
+            System.out.println("Current Score: " + model.getScore());
+        }
+        repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		 model.deleteBubblesAtPoint(x, y);
+	        int prevScore = model.getScore();
+	        if (model.getScore() != prevScore) {
+	            System.out.println("Current Score: " + model.getScore());
+	        }
+	        repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/14/e016b3b8edf6001d156f96ef84be4885

@@ -0,0 +1,5 @@
+public class Start {
+	public static void main(String[] args) {
+		Shape.testShape();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/15/601fb333f9f6001d156f96ef84be4885

@@ -0,0 +1,65 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/19/00319d30f2f6001d156f96ef84be4885

@@ -0,0 +1,102 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/1b/50db9cedeff6001d156f96ef84be4885

@@ -0,0 +1,101 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		new Bubble((int)(w * Math.random()), (int)(h * Math.random()));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for(IShape b: bubbles) {
+			if(!b.isVisible(w, h)) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/2/0097a7f9eff6001d156f96ef84be4885

@@ -0,0 +1,6 @@
+public class Start {
+	public static void main(String[] args) {
+		Shape.testShape();
+		Bubble.testBubble();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/26/300c5f73f6f6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class MyFrame {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/29/00440f1af2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(0, 9);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/2c/0003dc0bf2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore());
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore());
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/2d/50d46694f9f6001d156f96ef84be4885

@@ -0,0 +1,49 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color((float)Math.random(), (float)Math.random(), (float)Math.random());
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/2e/d0565688faf6001d156f96ef84be4885

@@ -0,0 +1,66 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3/50c58d39fbf6001d1443834c37c94b13

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/32/30f24b9fedf6001d156f96ef84be4885

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		int x = (int) Math.round(getX() - radius);
+        int y = (int) Math.round(getY() - radius);
+        int diameter = (int) Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/35/b039c988f6f6001d156f96ef84be4885

@@ -0,0 +1,7 @@
+public class Start {
+	public static void main(String[] args) {
+		Shape.testShape();
+		Bubble.testBubble();
+		Model.testModel();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/35/c05dda54f9f6001d156f96ef84be4885

@@ -0,0 +1,64 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+        model.clearInvisibles(w, h);
+        model.addBubble(w, h);
+        int prevScore = model.getScore();
+        if (model.getScore() != prevScore) {
+            System.out.println("Current Score: " + model.getScore());
+        }
+        repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		 model.deleteBubblesAtPoint(x, y);
+	        int prevScore = model.getScore();
+	        if (model.getScore() != prevScore) {
+	            System.out.println("Current Score: " + model.getScore());
+	        }
+	        repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/38/c0297aebecf6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class Bubble {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3a/009628d0f3f6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class ViewBubbles {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3d/0017243df1f6001d156f96ef84be4885

@@ -0,0 +1,102 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3e/3052a513f7f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3e/5004b9aff2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(double x, double y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        Bubble bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/3e/d06f3f58fbf6001d1443834c37c94b13

@@ -0,0 +1,49 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color((float)Math.random(), (float)Math.random(), (float)Math.random());
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(this.color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/4/00291739ebf6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class Start {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/4/30e20b70f9f6001d156f96ef84be4885

@@ -0,0 +1,104 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>(0);
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		Bubble bubble = new Bubble((int) (w * Math.random()), (int) (h * Math.random()));
+        bubbles.add(bubble);
+	}
+	
+	public void moveAll(int dx, int dy) {
+		 for (IShape bubble : bubbles) {
+	            bubble.setX(bubble.getX() + dx);
+	            bubble.setY(bubble.getY() + dy);
+	        }
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/40/405c89b6f1f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/4f/50a2afabf8f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>(0);
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/5/301f0c2debf6001d156f96ef84be4885

@@ -0,0 +1,51 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color((float)Math.random(),
+								(float)Math.random(),
+								(float)Math.random());
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/50/80b2f94bf1f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/50/d07efb55f1f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+    // instance variables
+    private int score;
+    private ArrayList<IShape> bubbles;
+
+    // constructor
+    public Model() {
+        this.score = 0;
+        this.bubbles = new ArrayList<IShape>();
+    }
+
+    // methods
+    public int getScore() {
+        return this.score;
+    }
+
+    public void addBubble(int w, int h) {
+        bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+    }
+
+    public void moveAll(int dx, int dy) {
+        for (IShape b : bubbles) {
+            b.setX(b.getX() + dx);
+            b.setY(b.getY() + dy);
+        }
+    }
+
+    public void clearInvisibles(int w, int h) {
+        for (int i = bubbles.size() - 1; i >= 0; i--) {
+            IShape bubble = bubbles.get(i);
+            if (!bubble.isVisible(w, h)) {
+                bubbles.remove(i);
+                score--;
+            }
+        }
+    }
+
+    public void deleteBubblesAtPoint(int x, int y) {
+        for (int i = bubbles.size() - 1; i >= 0; i--) {
+            IShape b = bubbles.get(i);
+            if (b.getX() == x && b.getY() == y) {
+                bubbles.remove(i);
+                score--;
+            }
+        }
+    }
+
+    public void drawAll(Graphics g) {
+        for (IShape b : bubbles) {
+            b.draw(g);
+        }
+    }
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/56/50a60687eff6001d156f96ef84be4885

@@ -0,0 +1,29 @@
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		new Bubble((int)(w * Math.random()), (int)(h * Math.random()));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/59/907000c0f8f6001d156f96ef84be4885

@@ -0,0 +1,104 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>(0);
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		Bubble bubble = new Bubble((int) (w * Math.random()), (int) (h * Math.random()));
+        bubbles.add(bubble);
+	}
+	
+	public void moveAll(int dx, int dy) {
+		 for (IShape bubble : bubbles) {
+	            bubble.setX(dx);
+	            bubble.setY(dy);
+	        }
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/5e/20ef18bbf4f6001d156f96ef84be4885

@@ -0,0 +1,39 @@
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				this.clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                this.moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/5f/f06d0145f7f6001d156f96ef84be4885

@@ -0,0 +1,64 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/6/20d58989f7f6001d156f96ef84be4885

@@ -0,0 +1,51 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color( (float)Math.random(),
+								(float)Math.random(),
+								(float)Math.random() );
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/61/a08516ccf2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/63/00e94a16f2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/69/e09e2141fbf6001d1443834c37c94b13

@@ -0,0 +1,51 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color( (float)Math.random(),
+								(float)Math.random(),
+								(float)Math.random() );
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/6b/20f30777faf6001d156f96ef84be4885

@@ -0,0 +1,66 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/7d/00453525f2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/81/f05420dff2f6001d156f96ef84be4885

@@ -0,0 +1,7 @@
+public class Start {
+	public static void main(String[] args) {
+		//Shape.testShape();
+		//Bubble.testBubble();
+		Model.testModel();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/83/00319102faf6001d156f96ef84be4885

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+		this.radius = 10.0;
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double dx = x - getX();
+        double dy = y - getY();
+        return dx * dx + dy * dy <= radius * radius;
+	}
+	
+	public void draw(Graphics g) {
+		super.paintComponent(g);
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/87/802aafcef5f6001d156f96ef84be4885

@@ -0,0 +1,41 @@
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private moveUp(int x, int y) {
+		
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/89/6086c075f7f6001d156f96ef84be4885

@@ -0,0 +1,64 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, 1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/8a/4005d900f0f6001d156f96ef84be4885

@@ -0,0 +1,7 @@
+public class Start {
+	public static void main(String[] args) {
+		Shape.testShape();
+		Bubble.testBubble();
+		Model.testModel();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/8e/e0953bb9eff6001d156f96ef84be4885

@@ -0,0 +1,54 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		new Bubble((int)(w * Math.random()), (int)(h * Math.random()));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for(IShape b: bubbles) {
+			if(!b.isVisible(w, h)) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/9/106bd6baf8f6001d156f96ef84be4885

@@ -0,0 +1,104 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>(0);
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		Bubble bubble = new Bubble((int) (w * Math.random()), (int) (h * Math.random()));
+        bubbles.add(bubble);
+	}
+	
+	public void moveAll(int dx, int dy) {
+		 for (IShape bubble : bubbles) {
+	            bubble.setX(bubble.getX() + dx);
+	            bubble.setY(bubble.getY() + dy);
+	        }
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/92/80ccb71febf6001d156f96ef84be4885

@@ -0,0 +1,17 @@
+import java.awt.Color;
+
+public class Shape {
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color((float)Math.random(),
+								(float)Math.random(),
+								(float)Math.random());
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/93/e02364f1ecf6001d156f96ef84be4885

@@ -0,0 +1,37 @@
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double cx = getX();
+		double cy = getY();
+		if(x > cx - 10 && x < cx + 10 && y > cy - 10 && y < cy + 10) {
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		drawOval(getX(), getY(), 10, 10);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/98/20ad2ce0f8f6001d156f96ef84be4885

@@ -0,0 +1,64 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/9b/2030b4aceff6001d156f96ef84be4885

@@ -0,0 +1,47 @@
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		new Bubble((int)(w * Math.random()), (int)(h * Math.random()));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for(IShape b: bubbles) {
+			if(!b.isVisible(w, h)) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/9f/9054acd6f2f6001d156f96ef84be4885

@@ -0,0 +1,102 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if (b.isIn(x, y)) {
+	            bubbles.remove(b);
+	            score++;
+	        }
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/a0/50e81638f1f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/a1/d056d6a9eaf6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class Shape {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ac/200b6505f2f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ac/70ce2ce2eef6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class Model {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/b0/b0f64d7bf9f6001d156f96ef84be4885

@@ -0,0 +1,49 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color((float)Math.random(), (float)Math.random(), (float)Math.random());
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/b1/b052eac6f1f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/b3/d0f23b20faf6001d156f96ef84be4885

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+		this.radius = 10.0;
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double dx = x - getX();
+        double dy = y - getY();
+        return dx * dx + dy * dy <= radius * radius;
+	}
+	
+	public void draw(Graphics g) {
+		super.draw(g);
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/b7/e026815efbf6001d1443834c37c94b13

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/c/70015da1f9f6001d156f96ef84be4885

@@ -0,0 +1,158 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+		this.radius = 10.0;
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double dx = x - getX();
+        double dy = y - getY();
+        return dx * dx + dy * dy <= radius * radius;
+	}
+	
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/c/f0a6551ff9f6001d156f96ef84be4885

@@ -0,0 +1,62 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/c0/405c3820edf6001d156f96ef84be4885

@@ -0,0 +1,37 @@
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double cx = getX();
+		double cy = getY();
+		if(x > cx - 10 && x < cx + 10 && y > cy - 10 && y < cy + 10) {
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		drawOval(getX(), getY(), 10);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/c5/9027267bf2f6001d156f96ef84be4885

@@ -0,0 +1,102 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score++;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore());
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/c6/f0e23a96f7f6001d156f96ef84be4885

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ce/20e462e4f5f6001d156f96ef84be4885

@@ -0,0 +1,59 @@
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		int w = this.getWidth();
+		int h = this.getHeight();
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				clickBubbles(e.getX(), e.getY());
+	      	}
+		});
+	      
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(w, h);
+            }
+        });
+		
+        timer.start();
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/d3/c0ad2df1f0f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+				return;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/d9/8059b62efbf6001d1443834c37c94b13

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	@Override
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/da/00002c65fbf6001d1443834c37c94b13

@@ -0,0 +1,51 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public abstract class Shape implements IShape{
+	//instance variables
+	private int x;
+	private int y;
+	private Color color;
+	
+	//constructor
+	public Shape(int x, int y) {
+		this.x = x;
+		this.y = y;
+		this.color = new Color( (float)Math.random(),
+								(float)Math.random(),
+								(float)Math.random() );
+	}
+
+	@Override
+	public int getX() {
+		return this.x;
+	}
+
+	@Override
+	public int getY() {
+		return this.y;
+	}
+
+	@Override
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	@Override
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	@Override
+	public abstract boolean isVisible(int w, int h);
+
+	@Override
+	public abstract boolean isIn(int x, int y);
+
+	@Override
+	public void draw(Graphics g) {
+		g.setColor(color);
+	}
+	
+	public static void testShape() {}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/e1/50726b82faf6001d156f96ef84be4885

@@ -0,0 +1,66 @@
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		this.setBackground(Color.WHITE);
+		
+		//timer
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                moveUp(getWidth(), getHeight());
+            }
+        });
+		
+        timer.start();
+        
+		//mouse listener
+		this.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                clickBubbles(e.getX(), e.getY());
+            }
+        });
+	      
+		
+	}
+	
+	//methods
+	private void moveUp(int w, int h) {
+		model.moveAll(0, -1);
+		int previousScore = model.getScore();
+		model.clearInvisibles(w, h);
+		model.addBubble(w, h);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	private void clickBubbles(int x, int y) {
+		int previousScore = model.getScore();
+		model.deleteBubblesAtPoint(x, y);
+		int currentScore = model.getScore();
+		if (currentScore != previousScore) {
+	        System.out.println("Current score: " + currentScore);
+	    }
+		repaint();
+	}
+	
+	protected void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		model.drawAll(g);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/e5/8051bbcae9f6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public interface IShape {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/e8/60a484a5f4f6001d156f96ef84be4885

@@ -0,0 +1,26 @@
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JPanel;
+import javax.swing.Timer;
+
+public class ViewBubbles extends JPanel{
+	//instance variable
+	private Model model;
+	
+	//constructor
+	public ViewBubbles(Model model) {
+		this.model = model;
+		int w = this.getWidth();
+		int h = this.getHeight();
+		Timer timer = new Timer(500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                this.moveUp(w, h);
+            }
+        });
+        timer.start();
+	}
+	
+	//methods
+	
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ea/a0c35a17f8f6001d156f96ef84be4885

@@ -0,0 +1,159 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+		this.radius = 10.0;
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ee/400e3f50faf6001d156f96ef84be4885

@@ -0,0 +1,104 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>(0);
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		Bubble bubble = new Bubble((int) (w * Math.random()), (int) (h * Math.random()));
+        bubbles.add(bubble);
+	}
+	
+	public void moveAll(int dx, int dy) {
+		 for (IShape bubble : bubbles) {
+	            bubble.setX(bubble.getX() + dx);
+	            bubble.setY(bubble.getY() + dy);
+	        }
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            this.score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+	    for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (bubble.isIn(x, y)) {
+	            bubbles.remove(i);
+	            score++;
+	        }
+	    }
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/ee/a028b78ce9f6001d156f96ef84be4885

@@ -0,0 +1,4 @@
+
+public class IShape {
+
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/f5/b012deb4f0f6001d156f96ef84be4885

@@ -0,0 +1,102 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		new Bubble((int)(w * Math.random()), (int)(h * Math.random()));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape bubble = bubbles.get(i);
+	        if (!bubble.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+		for(IShape b: bubbles) {
+			if(b.getX() == x && b.getY() == y) {
+				bubbles.remove(b);
+				this.score--;
+			}
+		}
+	}
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/f7/d0f530faf0f6001d156f96ef84be4885

@@ -0,0 +1,103 @@
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+public class Model {
+	//instance variables
+	private int score;
+	private ArrayList<IShape> bubbles;
+	
+	//constructor
+	public Model() {
+		this.score = 0;
+		this.bubbles = new ArrayList<IShape>();
+	}
+	
+	//methods
+	public int getScore() {
+		return this.score;
+	}
+	
+	public void addBubble(int w, int h) {
+		bubbles.add(new Bubble((int)(w * Math.random()), (int)(h * Math.random())));
+	}
+	
+	public void moveAll(int dx, int dy) {
+		for(IShape b: bubbles) {
+			b.setX(b.getX()+dx);
+			b.setY(b.getY()+dy);
+		}
+	}
+	
+	public void clearInvisibles(int w, int h) {
+		for (int i = bubbles.size() - 1; i >= 0; i--) {
+	        IShape b = bubbles.get(i);
+	        if (!b.isVisible(w, h)) {
+	            bubbles.remove(i);
+	            score--;
+	        }
+	    }
+	}
+	
+	public void deleteBubblesAtPoint(int x, int y) {
+        for (int i = bubbles.size() - 1; i >= 0; i--) {
+            IShape b = bubbles.get(i);
+            if (b.getX() == x && b.getY() == y) {
+                bubbles.remove(i);
+                score--;
+            }
+        }
+    }
+	
+	public void drawAll(Graphics g) {
+		for(IShape b: bubbles) {
+			b.draw(g);
+		}
+	}
+	
+	public static void testModel() {
+		Model m = new Model();
+		System.out.println(m.getScore() == 0);
+		// Testing the bubbles arraylist by directly accessing
+		// the arraylist inside the object m. This is not very clean (it only
+		// works when the tests are done from inside the class itself) but it
+		// allows us to test more methods.
+		System.out.println(m.bubbles.size() == 0);
+		// Add two bubbles.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 99), [0, 99)).
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == 0);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(0, 0);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and moving them out of the window.
+		m.addBubble(100, 100);
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.moveAll(200, 200);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 2);
+		m.clearInvisibles(200, 200);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 0);
+		// Adding two bubbles again and clicking into them to remove them.
+		m.addBubble(10, 10);
+		m.addBubble(10, 10);
+		System.out.println(m.getScore() == -4);
+		System.out.println(m.bubbles.size() == 2);
+		// The two bubbles we have are somewhere in the square ([0, 9), [0, 9)).
+		m.deleteBubblesAtPoint(5, 5);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 0);
+		// We cannot test the drawAll method because we don't have any graphics object.
+		// Adding a bubble again and clearing everything.
+		m.addBubble(100, 100);
+		System.out.println(m.getScore() == -2);
+		System.out.println(m.bubbles.size() == 1);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.history/fb/b0732a0af8f6001d156f96ef84be4885

@@ -0,0 +1,158 @@
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class Bubble extends Shape {
+	//instance variable
+	private double radius = 10;
+	
+	//constructor
+	public Bubble(int x, int y) {
+		super(x, y);
+	}
+
+	@Override
+	public boolean isVisible(int w, int h) {
+		double x = getX();
+		double y = getY();
+		double wx = (x < 0 ? 0 : (x > w - 1 ? w - 1 : x));
+		double wy = (y < 0 ? 0 : (y > h - 1 ? h - 1 : y));
+		double dx = wx - x;
+		double dy = wy - y;
+		return dx * dx + dy * dy <= radius * radius;
+	}
+
+	@Override
+	public boolean isIn(int x, int y) {
+		double centerX = getX();
+        double centerY = getY();
+        double distance = Math.sqrt((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY));
+        return distance <= radius;
+	}
+	
+	public void draw(Graphics g) {
+		int x = (int)Math.round(getX() - radius);
+        int y = (int)Math.round(getY() - radius);
+        int diameter = (int)Math.round(radius * 2);
+        g.drawOval(x, y, diameter, diameter);
+	}
+	
+	//test
+	public static void testBubble() {
+		Bubble b = new Bubble(20, 30);
+		System.out.println(b.getX() == 20);
+		System.out.println(b.getY() == 30);
+		b.setX(40);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 30);
+		b.setY(60);
+		System.out.println(b.getX() == 40);
+		System.out.println(b.getY() == 60);
+		// circle fully inside window
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top edge
+		b.setX(50);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window right edge
+		b.setX(99);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom edge
+		b.setX(50);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window left edge
+		b.setX(0);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top left corner
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window top right corner
+		b.setX(99);
+		b.setY(0);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom right corner
+		b.setX(99);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle center on window bottom left corner
+		b.setX(0);
+		b.setY(99);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge on window top edge
+		b.setX(50);
+		b.setY(-10);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle left edge on window right edge
+		b.setX(109);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top edge on window bottom edge
+		b.setX(50);
+		b.setY(109);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle right edge on window left edge
+		b.setX(-10);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom right edge on window top left corner
+		b.setX(-7);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom left edge on window top right corner
+		b.setX(106);
+		b.setY(-7);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top left edge on window bottom right corner
+		b.setX(106);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle top right edge on window bottom left corner
+		b.setX(-7);
+		b.setY(106);
+		System.out.println(b.isVisible(100, 100) == true);
+		// circle bottom edge beyond window top edge
+		b.setX(50);
+		b.setY(-11);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle left edge beyond window right edge
+		b.setX(110);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top edge beyond window bottom edge
+		b.setX(50);
+		b.setY(110);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle right edge beyond window left edge
+		b.setX(-11);
+		b.setY(50);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom right edge beyond window top left corner
+		b.setX(-8);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle bottom left edge beyond window top right corner
+		b.setX(107);
+		b.setY(-8);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top left edge beyond window bottom right corner
+		b.setX(107);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		// circle top right edge beyond window bottom left corner
+		b.setX(-8);
+		b.setY(107);
+		System.out.println(b.isVisible(100, 100) == false);
+		b.setX(0);
+		b.setY(0);
+		System.out.println(b.isIn(2, 2) == true);
+		System.out.println(b.isIn(10, 0) == true);
+		System.out.println(b.isIn(0, 10) == true);
+		System.out.println(b.isIn(7, 7) == true);
+		System.out.println(b.isIn(11, 0) == false);
+		System.out.println(b.isIn(0, 11) == false);
+		System.out.println(b.isIn(8, 8) == false);
+	}
+}

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version

@@ -0,0 +1 @@
+

PastAssignments/Assignment6/Assignment6_2230026071/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version

@@ -0,0 +1 @@
+