diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java index e8f6cbfab99ac6c5a0cc573eb2dd388280483bfe..1e54e573da1c8b0bdc153a38e16e68234f83e648 100644 --- a/src/ac/ed/lurg/ModelMain.java +++ b/src/ac/ed/lurg/ModelMain.java @@ -241,7 +241,7 @@ public class ModelMain { // DEBUG code - if (!(country.getCountryName().equals("United States of America") || country.getCountryName().equals("Russian Federationxx"))) { //|| country.getCountryName().equals("China") + if (!(country.getCountryName().equals("United States of Americaxx") || country.getCountryName().equals("Russian Federationxx") || country.getCountryName().equals("China")) ) { //|| country.getCountryName().equals("China") continue; } diff --git a/src/ac/sac/raster/RasterSetTest.java b/src/ac/sac/raster/RasterSetTest.java index 1871791e9a7538aaad48f209df34d01394a63430..cf454d228e12287f83a3ca323e20f1534e1a4db7 100644 --- a/src/ac/sac/raster/RasterSetTest.java +++ b/src/ac/sac/raster/RasterSetTest.java @@ -1,18 +1,16 @@ package ac.sac.raster; -import org.junit.Test; +//import org.junit.Test; import ac.ed.lurg.yield.YieldRaster; public class RasterSetTest { - @Test +// @Test public void test() { YieldRaster dataset = new YieldRaster(new RasterHeaderDetails(720,360,-180,-90,0.5,0.5,"")); double y = dataset.getYCoordin(new RasterKey(0,179)); System.out.println("y=" +y); - - } }