Projects >> WWIDesigner >>5ecdb24122ba69802e61188e9837f1eb4126fbe3

Chunk
Conflicting content 
	private static String tuningFile_chalumeau = "com/wwidesigner/optimization/example/chalumeau_alto_tuning.xml";

	@Test
<<<<<<< HEAD
	public void testNafTuningWithGordon()
=======
	public void testNafTuning()
>>>>>>> cf702d25e35c80df138af89f77c42afd86b0f988
	{
		SimpleInstrumentTuner tuner = new SimpleInstrumentTuner();
		try
Solution content 
	private static String tuningFile_chalumeau = "com/wwidesigner/optimization/example/chalumeau_alto_tuning.xml";

	@Test
	public void testNafTuningWithGordon()
	{
		SimpleInstrumentTuner tuner = new SimpleInstrumentTuner();
		try
File
SimpleTuningTest.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
			tuner.setParams(new PhysicalParameters(74.0, TemperatureType.F));
			tuner.setCalculator(new GordonCalculator());

<<<<<<< HEAD
			checkTuning(tuner);
=======
			Map tuningMap = tuner.getTuning();
			for (Map.Entry entry : tuningMap.entrySet())
			{
				Note note = entry.getKey().getNote();
				assertEquals(note.getName() + " tuning incorrect",
						note.getFrequency(), entry.getValue(), 20.);
			}
>>>>>>> cf702d25e35c80df138af89f77c42afd86b0f988
		}
		catch (Exception e)
		{
Solution content 
			tuner.setParams(new PhysicalParameters(74.0, TemperatureType.F));
			tuner.setCalculator(new GordonCalculator());

			checkTuning(tuner);
		}
		catch (Exception e)
		{
File
SimpleTuningTest.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
		{
			fail(e.getMessage());
		}
	}
<<<<<<< HEAD

	protected void checkTuning(SimpleInstrumentTuner tuner)
	{
		Map tuningMap = tuner.getTuning();
		for (Map.Entry entry : tuningMap.entrySet())
			Note note = entry.getKey().getNote();
			assertEquals(note.getName() + " tuning incorrect",
					note.getFrequency(), entry.getValue(), 20.);
		}
	}
=======
>>>>>>> cf702d25e35c80df138af89f77c42afd86b0f988

	/**
	 * @param args
Solution content 
			fail(e.getMessage());
		}
	}

	protected void checkTuning(SimpleInstrumentTuner tuner)
	{
		Map tuningMap = tuner.getTuning();
		for (Map.Entry entry : tuningMap.entrySet())
		{
			Note note = entry.getKey().getNote();
			assertEquals(note.getName() + " tuning incorrect",
					note.getFrequency(), entry.getValue(), 20.);
		}
	}

	/**
	 * @param args
File
SimpleTuningTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration