fudaa-cvs-commit

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv13994/test/h2d

Modified Files:
	TestBord.java 
Log Message:
Ajout du pattern command pour annuler des operations


Index: TestBord.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestBord.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestBord.java	23 Sep 2003 20:22:11 -0000	1.2
--- TestBord.java	29 Oct 2003 11:41:28 -0000	1.3
***************
*** 1,67 ****
! /*
!  *  @file         TestBord.java
!  *  @creation     25 août 2003
!  *  @modification $Date$
!  *  @license      GNU General Public License 2
!  *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
!  *  @mail         de...@fu...
!  */
! package org.fudaa.dodico.test.h2d;
! 
! import org.fudaa.dodico.h2d.H2dBord;
! import org.fudaa.dodico.h2d.H2dBordMutable;
! 
! import junit.framework.TestCase;
! 
! /**
!  * @author deniger
!  * @version $Id$
!  */
! public class TestBord extends TestCase {
! 
!   /**
!    * 
!    */
!   public TestBord() {
!     super();
!   }
! 
!   public void testBordIdx() {
!     H2dBordMutable b= new H2dBordMutable();
!     b.setIdxDeb(0);
!     b.setIdxFin(5);
!     int nb= 10;
!     assertEquals(6, b.getNPointInBord(nb));
!     H2dBord.BordIndexIterator it= b.createIterator(nb);
! 
!     for (int i= 0; i < 6; i++) {
!       assertTrue(it.hasNext());
!       assertEquals(i, it.next());
!     }
!     assertFalse(it.hasNext());
!     b.setIdxDeb(0);
!     b.setIdxFin(0);
!     it= b.createIterator(nb);
!     for (int i= 0; i < 10; i++) {
!       assertTrue(it.hasNext());
!       assertEquals(i, it.next());
!     }
!     assertFalse(it.hasNext());
!     b.setIdxDeb(8);
!     b.setIdxFin(0);
!     it= b.createIterator(nb);
!     assertTrue(it.hasNext());
!     assertEquals(8, it.next());
!     assertTrue(it.hasNext());
!     assertEquals(9, it.next());
!     assertTrue(it.hasNext());
!     assertEquals(0, it.next());
!     assertFalse(it.hasNext());
! //    assertTrue(it.hasNext());
! //    assertEquals(1, it.next());
! //    assertTrue(it.hasNext());
! //    assertEquals(2, it.next());
! 
!   }
! 
! }
--- 1 ----
! /*
 *  @file         TestBord.java
 *  @creation     25 août 2003
 *  @modification $Date$
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.test.h2d;
import junit.framework.TestCase;
import org.fudaa.dodico.h2d.H2dBord;
import org.fudaa.dodico.h2d.H2dBordMutable;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBord;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBordMutable;
import org.fudaa.dodico.h2d.type.H2dBordType;
/**
 * @author deniger
 * @version $Id$
 */
public class TestBord extends TestCase {
  /**
   * 
   */
  public TestBord() {
    super();
  }
  public void testBordIdx() {
    H2dBordMutable b= new H2dBordMutable();
    b.setIdxDeb(0);
    b.setIdxFin(5);
    int nb= 10;
    assertEquals(6, b.getNPointInBord(nb));
    H2dBord.BordIndexIterator it= b.createIterator(nb);
    for (int i= 0; i < 6; i++) {
      assertTrue(it.hasNext());
      assertEquals(i, it.next());
    }
    assertFalse(it.hasNext());
    b.setIdxDeb(0);
    b.setIdxFin(0);
    it= b.createIterator(nb);
    for (int i= 0; i < 10; i++) {
      assertTrue(it.hasNext());
      assertEquals(i, it.next());
    }
    assertFalse(it.hasNext());
    b.setIdxDeb(8);
    b.setIdxFin(0);
    it= b.createIterator(nb);
    assertTrue(it.hasNext());
    assertEquals(8, it.next());
    assertTrue(it.hasNext());
    assertEquals(9, it.next());
    assertTrue(it.hasNext());
    assertEquals(0, it.next());
    assertFalse(it.hasNext());
    b.setIdxDeb(0);
    b.setIdxFin(5);
    assertTrue(b.containsIdx(0));
    assertTrue(b.containsIdx(1));
    assertTrue(b.containsIdx(2));
    assertTrue(b.containsIdx(5));
    assertFalse(b.containsIdx(6));
    assertFalse(b.containsIdx(-1));
    b.setIdxDeb(10);
    b.setIdxFin(1);
    assertTrue(b.containsIdx(1));
    assertTrue(b.containsIdx(0));
    assertTrue(b.containsIdx(10));
    assertTrue(b.containsIdx(1111111));
    assertFalse(b.containsIdx(2));
    assertFalse(b.containsIdx(3));
    assertEquals(3, b.getNPointInBord(11));
    b.setIdxDeb(0);
    b.setIdxFin(0);
    assertTrue(b.containsZeroIndex());
    b.setIdxFin(1);
    assertTrue(b.containsZeroIndex());
    b.setIdxDeb(100);
    assertTrue(b.containsZeroIndex());
    b.setIdxFin(0);
    assertTrue(b.containsZeroIndex());
    b.setIdxDeb(5);
    b.setIdxFin(6);
    assertFalse(b.containsZeroIndex());
  }
  public void testTelemacIntersection() {
    H2dTelemacBordMutable b= new H2dTelemacBordMutable();
    b.setIdxDeb(12);
    b.setIdxFin(16);
    assertTrue(b.isBeginIdxSelected(12, 12));
    assertTrue(b.isBeginIdxSelected(0, 14));
    assertTrue(b.isBeginIdxSelected(50, 13));
    assertFalse(b.isBeginIdxSelected(50, 10));
    assertFalse(b.isBeginIdxSelected(10, 11));
    assertFalse(b.isBeginIdxSelected(13, 130));
    int nbP= 20;
    b.setType(H2dBordType.LIQUIDE_DEBIT_IMPOSE);
    assertEquals(-1, b.isIntersectBy(0, 11, nbP));
    assertEquals(0, b.isIntersectBy(0, 12, nbP));
    assertEquals(1, b.isIntersectBy(13, 14, nbP));
    assertEquals(2, b.isIntersectBy(12, 16, nbP));
    assertEquals(2, b.isIntersectBy(12, 17, nbP));
    assertEquals(2, b.isIntersectBy(19, 16, nbP));
    assertEquals(0, b.isIntersectBy(19, 15, nbP));
    assertEquals(-1, b.isIntersectBy(19, 11, nbP));
    b.setType(H2dBordType.SOLIDE);
    assertEquals(-1, b.isIntersectBy(0, 12, nbP));
    assertEquals(0, b.isIntersectBy(13, 14, nbP));
    assertEquals(1, b.isIntersectBy(14, 14, nbP));
    assertEquals(2, b.isIntersectBy(19, 15, nbP));
    assertEquals(-1, b.isIntersectBy(19, 12, nbP));
    b.setIdxDeb(16);
    b.setIdxFin(5);
    b.setType(H2dBordType.LIQUIDE_DEBIT_IMPOSE);
    assertEquals(-1, b.isIntersectBy(6, 15, nbP));
    assertEquals(0, b.isIntersectBy(4, 12, nbP));
    assertEquals(1, b.isIntersectBy(0, 4, nbP));
    assertEquals(1, b.isIntersectBy(17, 4, nbP));
    assertEquals(2, b.isIntersectBy(15, 6, nbP));
    b.setType(H2dBordType.SOLIDE);
    assertEquals(-1, b.isIntersectBy(5, 16, nbP));
    assertEquals(0, b.isIntersectBy(4, 14, nbP));
    assertEquals(0, b.isIntersectBy(18, 9, nbP));
    assertEquals(1, b.isIntersectBy(19, 3, nbP));
    assertEquals(2, b.isIntersectBy(16, 5, nbP));
  }
}
\ No newline at end of file