new two-bucket exercise (#1315)

* new two-bucket exercise

* new two-bucket exercise

* update two-bucket exercise

config.json

@@ -614,6 +614,19 @@
     },
     {
       "core": false,
+      "difficulty": 5,
+      "slug": "two-bucket",
+      "topics": [
+        "algorithms",
+        "loops",
+        "conditionals",
+        "mathematics"
+      ],
+      "unlocked_by": "triangle",
+      "uuid": "210bf628-b385-443b-8329-3483cc6e8d7e"
+    },
+    {
+      "core": false,
       "difficulty": 6,
       "slug": "alphametics",
       "topics": [

exercises/settings.gradle

@@ -90,6 +90,7 @@ include 'transpose'
 include 'triangle'
 include 'trinary'
 include 'twelve-days'
+include 'two-bucket'
 include 'two-fer'
 include 'word-count'
 include 'word-search'

exercises/two-bucket/.meta/src/reference/java/TwoBucket.java

@@ -0,0 +1,145 @@
+import java.util.ArrayList;
+import java.util.Objects;
+
+class TwoBucket {
+	
+    private class State {
+    	int moves;
+    	int bucketOne;
+    	int bucketTwo;
+    	
+    	State (int moves, int bucketOne, int bucketTwo) {
+    		this.moves = moves;
+    		this.bucketOne = bucketOne;
+    		this.bucketTwo = bucketTwo;
+    	}
+    	
+    	@Override
+    	public boolean equals(Object o) {
+    		State otherState = (State) o;
+    		return this.moves == otherState.moves &&
+    				this.bucketOne == otherState.bucketOne &&
+    				this.bucketTwo == otherState.bucketTwo;
+    	}
+    	
+    	@Override
+    	public int hashCode() {
+    		return Objects.hash(moves, bucketOne, bucketTwo);
+    	}
+    }
+    
+    private State finalState;
+    
+    private int bucketOneCap;
+    private int bucketTwoCap;
+    private int desiredLiters;
+    private String startBucket;
+    
+    TwoBucket(int bucketOneCap, int bucketTwoCap, int desiredLiters, String startBucket) {
+    	this.bucketOneCap = bucketOneCap;
+    	this.bucketTwoCap = bucketTwoCap;
+    	this.desiredLiters = desiredLiters;
+    	this.startBucket = startBucket;
+    	
+    	finalState = computeFinalState();
+    }
+    
+    private ArrayList<State> getAdjacentStates (State state) {
+    	ArrayList<State> adjacentStates = new ArrayList<State>();
+    	
+    	//Empty bucket one
+    	adjacentStates.add(new State(state.moves + 1, 0, state.bucketTwo));
+    	
+    	//Empty bucket two
+    	adjacentStates.add(new State(state.moves + 1, state.bucketOne, 0));
+    	
+    	//Fill bucket one
+    	adjacentStates.add(new State(state.moves + 1, bucketOneCap, state.bucketTwo));
+    	
+    	//Fill bucket two
+    	adjacentStates.add(new State(state.moves + 1, state.bucketOne, bucketTwoCap));
+    	
+    	//pour from bucket one to bucket two
+    	if (state.bucketOne + state.bucketTwo > bucketTwoCap) {
+    		adjacentStates.add(new State(state.moves + 1, state.bucketOne - (bucketTwoCap - state.bucketTwo), bucketTwoCap));
+    	} else {
+    		adjacentStates.add(new State(state.moves + 1, 0, state.bucketOne + state.bucketTwo));
+    	}
+    	
+    	//pour from bucket two to bucket one
+    	if (state.bucketTwo + state.bucketOne > bucketOneCap) {
+    		adjacentStates.add(new State(state.moves + 1, bucketOneCap, state.bucketTwo - (bucketOneCap - state.bucketOne)));
+    	} else {
+    		adjacentStates.add(new State(state.moves + 1, state.bucketTwo + state.bucketOne, 0));
+    	}
+    	
+    	return adjacentStates;
+    }
+    
+    private boolean isValid(State state) {
+    	if (state.bucketOne == bucketOneCap && state.bucketTwo == 0 && startBucket.equals("two")) {
+    		return false;
+    	} else if (state.bucketOne == 0 && state.bucketTwo == bucketTwoCap && startBucket.equals("two")) {
+    		return false;
+    	} else {
+    		return true;
+    	}
+    }
+    
+    private State computeFinalState() {
+    	ArrayList<State> paths = new ArrayList<State>();
+    	
+    	State initialState;
+    	if (startBucket.equals("one")) {
+    		initialState = new State(1, bucketOneCap, 0);
+    	} else {
+    		initialState = new State(1, 0, bucketTwoCap);
+    	}
+    	
+    	if (initialState.bucketOne == desiredLiters || initialState.bucketTwo == desiredLiters) {
+    		return initialState;
+    	}
+    	
+    	paths.add(initialState);
+    	
+    	for (int i = 0; i < 10000; i++) {
+    		State currentState = paths.remove(0);
+    		ArrayList<State> adjacentStates = getAdjacentStates(currentState);
+    		for (State state : adjacentStates) {
+    			if (state.bucketOne == desiredLiters || state.bucketTwo == desiredLiters) {
+    				return state;
+    			}
+    			
+    			if (!paths.contains(state) && isValid(state)) {
+    				paths.add(state);
+    			}
+    		}
+    	}
+    	
+    	return null;
+    }
+    
+    int getTotalMoves() {
+    	return finalState.moves;
+    }
+    
+    String getFinalBucket() {
+    	if (finalState.bucketOne == desiredLiters) {
+    		return "one";
+    	} else if(finalState.bucketTwo == desiredLiters) {
+    		return "two";
+    	} else {
+    		return "No solution found in " + finalState.moves + " iterations!";
+    	}
+    }
+    
+    int getOtherBucket() {
+    	if (getFinalBucket().equals("one")) {
+    		return finalState.bucketTwo;
+    	} else if(getFinalBucket().equals("two")) {
+    		return finalState.bucketOne;
+    	} else {
+    		return -1;
+    	}
+    }
+}

exercises/two-bucket/.meta/version

@@ -0,0 +1 @@
+1.4.0

exercises/two-bucket/README.md

@@ -0,0 +1,48 @@
+# Two Bucket
+
+Given two buckets of different size, demonstrate how to measure an exact number of liters by strategically transferring liters of fluid between the buckets.
+
+Since this mathematical problem is fairly subject to interpretation / individual approach, the tests have been written specifically to expect one overarching solution.
+
+To help, the tests provide you with which bucket to fill first. That means, when starting with the larger bucket full, you are NOT allowed at any point to have the smaller bucket full and the larger bucket empty (aka, the opposite starting point); that would defeat the purpose of comparing both approaches!
+
+Your program will take as input:
+- the size of bucket one
+- the size of bucket two
+- the desired number of liters to reach
+- which bucket to fill first, either bucket one or bucket two
+
+Your program should determine:
+- the total number of "moves" it should take to reach the desired number of liters, including the first fill
+- which bucket should end up with the desired number of liters (let's say this is bucket A) - either bucket one or bucket two
+- how many liters are left in the other bucket (bucket B)
+
+Note: any time a change is made to either or both buckets counts as one (1) move.
+
+Example:
+Bucket one can hold up to 7 liters, and bucket two can hold up to 11 liters. Let's say bucket one, at a given step, is holding 7 liters, and bucket two is holding 8 liters (7,8). If you empty bucket one and make no change to bucket two, leaving you with 0 liters and 8 liters respectively (0,8), that counts as one "move". Instead, if you had poured from bucket one into bucket two until bucket two was full, leaving you with 4 liters in bucket one and 11 liters in bucket two (4,11), that would count as only one "move" as well.
+
+To conclude, the only valid moves are:
+- pouring from one bucket to another
+- emptying one bucket and doing nothing to the other
+- filling one bucket and doing nothing to the other
+
+Written with <3 at [Fullstack Academy](http://www.fullstackacademy.com/) by [Lindsay](http://lindsaylevine.com).
+
+# Running the tests
+
+You can run all the tests for an exercise by entering
+
+```sh
+$ gradle test
+```
+
+in your terminal.
+
+## Source
+
+Water Pouring Problem [http://demonstrations.wolfram.com/WaterPouringProblem/](http://demonstrations.wolfram.com/WaterPouringProblem/)
+
+## Submitting Incomplete Solutions
+
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.

exercises/two-bucket/build.gradle

@@ -0,0 +1,18 @@
+apply plugin: "java"
+apply plugin: "eclipse"
+apply plugin: "idea"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile "junit:junit:4.12"
+}
+
+test {
+    testLogging {
+        exceptionFormat = 'full'
+        events = ["passed", "failed", "skipped"]
+    }
+}

exercises/two-bucket/src/test/java/TwoBucketTest.java

@@ -0,0 +1,77 @@
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class TwoBucketTest {
+	
+	@Test
+	public void testBucketOneSizeThreeBucketTwoSizeFiveStartWithOne() {
+		
+		TwoBucket twoBucket = new TwoBucket(3, 5, 1, "one");
+		
+		assertEquals(4, twoBucket.getTotalMoves());
+		assertEquals("one", twoBucket.getFinalBucket());
+		assertEquals(5, twoBucket.getOtherBucket());
+		
+	}
+	
+	@Ignore("Remove to run test")
+	@Test
+	public void testBucketOneSizeThreeBucketTwoSizeFiveStartWithTwo() {
+		
+		TwoBucket twoBucket = new TwoBucket(3, 5, 1, "two");
+		
+		assertEquals(8, twoBucket.getTotalMoves());
+		assertEquals("two", twoBucket.getFinalBucket());
+		assertEquals(3, twoBucket.getOtherBucket());
+		
+	}
+	
+	@Ignore("Remove to run test")
+	@Test
+	public void testBucketOneSizeSevenBucketTwoSizeElevenStartWithOne() {
+		
+		TwoBucket twoBucket = new TwoBucket(7, 11, 2, "one");
+		
+		assertEquals(14, twoBucket.getTotalMoves());
+		assertEquals("one", twoBucket.getFinalBucket());
+		assertEquals(11, twoBucket.getOtherBucket());
+		
+	}
+	
+	@Ignore("Remove to run test")
+	@Test
+	public void testBucketOneSizeSevenBucketTwoSizeElevenStartWithTwo() {
+		
+		TwoBucket twoBucket = new TwoBucket(7, 11, 2, "two");
+		
+		assertEquals(18, twoBucket.getTotalMoves());
+		assertEquals("two", twoBucket.getFinalBucket());
+		assertEquals(7, twoBucket.getOtherBucket());
+		
+	}
+	
+	@Ignore("Remove to run test")
+	@Test
+	public void testBucketOneSizeOneBucketTwoSizeThreeStartWithTwo() {
+		
+		TwoBucket twoBucket = new TwoBucket(1, 3, 3, "two");
+		
+		assertEquals(1, twoBucket.getTotalMoves());
+		assertEquals("two", twoBucket.getFinalBucket());
+		assertEquals(0, twoBucket.getOtherBucket());
+		
+	}
+	
+	@Ignore("Remove to run test")
+	@Test
+	public void testBucketOneSizeTwoBucketTwoSizeThreeStartWithOne() {
+		
+		TwoBucket twoBucket = new TwoBucket(2, 3, 3, "one");
+		
+		assertEquals(2, twoBucket.getTotalMoves());
+		assertEquals("two", twoBucket.getFinalBucket());
+		assertEquals(2, twoBucket.getOtherBucket());
+		
+	}
+}