From 763ccd5fd3983235145c49ed8eac962d0d451bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Sat, 30 Aug 2008 22:40:22 +0000
Subject: [PATCH] - used parser rentrance through initAlignment( null )
---
src/fr/inrialpes/exmo/align/util/EvalAlign.java | 8 ++++----
src/fr/inrialpes/exmo/align/util/ExtGroupEval.java | 8 ++++----
src/fr/inrialpes/exmo/align/util/GenPlot.java | 8 ++++----
src/fr/inrialpes/exmo/align/util/GenTriangle.java | 8 ++++----
src/fr/inrialpes/exmo/align/util/GroupEval.java | 8 ++++----
src/fr/inrialpes/exmo/align/util/GroupOutput.java | 8 ++++----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/util/EvalAlign.java b/src/fr/inrialpes/exmo/align/util/EvalAlign.java
index 5afa9255..2ca4e295 100644
--- a/src/fr/inrialpes/exmo/align/util/EvalAlign.java
+++ b/src/fr/inrialpes/exmo/align/util/EvalAlign.java
@@ -147,11 +147,11 @@ public class EvalAlign {
Alignment align1=null, align2 = null;
try {
// Load alignments
- AlignmentParser aparser1 = new AlignmentParser( debug );
- align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( debug );
+ align1 = aparser.parse( alignName1 );
if ( debug > 0 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( debug );
- align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ align2 = aparser.parse( alignName2 );
if ( debug > 0 ) System.err.println(" Alignment structure2 parsed");
} catch ( Exception ex ) { ex.printStackTrace(); }
diff --git a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
index 7850c188..6f096eaf 100644
--- a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
@@ -233,11 +233,11 @@ public class ExtGroupEval {
if ( debug < 2 ) nextdebug = 0;
else nextdebug = debug - 2;
// Load alignments
- AlignmentParser aparser1 = new AlignmentParser( nextdebug );
- Alignment align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( nextdebug );
+ Alignment align1 = aparser.parse( alignName1 );
if ( debug > 1 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( nextdebug );
- Alignment align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ Alignment align2 = aparser.parse( alignName2 );
if ( debug > 1 ) System.err.println(" Alignment structure2 parsed");
// Create evaluator object
eval = new ExtPREvaluator(ObjectAlignment.toObjectAlignment( (URIAlignment)align1, loaded ),
diff --git a/src/fr/inrialpes/exmo/align/util/GenPlot.java b/src/fr/inrialpes/exmo/align/util/GenPlot.java
index 71031ab6..e275bc70 100644
--- a/src/fr/inrialpes/exmo/align/util/GenPlot.java
+++ b/src/fr/inrialpes/exmo/align/util/GenPlot.java
@@ -251,11 +251,11 @@ public class GenPlot {
if ( debug < 2 ) nextdebug = 0;
else nextdebug = debug - 2;
// Load alignments
- AlignmentParser aparser1 = new AlignmentParser( nextdebug );
- Alignment align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( nextdebug );
+ Alignment align1 = aparser.parse( alignName1 );
if ( debug > 1 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( nextdebug );
- Alignment align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ Alignment align2 = aparser.parse( alignName2 );
if ( debug > 1 ) System.err.println(" Alignment structure2 parsed");
// Create evaluator object
eval = new PRGraphEvaluator( align1, align2 );
diff --git a/src/fr/inrialpes/exmo/align/util/GenTriangle.java b/src/fr/inrialpes/exmo/align/util/GenTriangle.java
index bf6cece4..b5ac61b2 100644
--- a/src/fr/inrialpes/exmo/align/util/GenTriangle.java
+++ b/src/fr/inrialpes/exmo/align/util/GenTriangle.java
@@ -253,11 +253,11 @@ public class GenTriangle {
if ( debug < 2 ) nextdebug = 0;
else nextdebug = debug - 2;
// Load alignments
- AlignmentParser aparser1 = new AlignmentParser( nextdebug );
- Alignment align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( nextdebug );
+ Alignment align1 = aparser.parse( alignName1 );
if ( debug > 2 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( nextdebug );
- Alignment align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ Alignment align2 = aparser.parse( alignName2 );
if ( debug > 2 ) System.err.println(" Alignment structure2 parsed");
// Create evaluator object
eval = new PRecEvaluator( align1, align2 );
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index 1fab8447..266420bf 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -254,11 +254,11 @@ public class GroupEval {
if ( debug < 2 ) nextdebug = 0;
else nextdebug = debug - 2;
// Load alignments
- AlignmentParser aparser1 = new AlignmentParser( nextdebug );
- Alignment align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( nextdebug );
+ Alignment align1 = aparser.parse( alignName1 );
if ( debug > 2 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( nextdebug );
- Alignment align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ Alignment align2 = aparser.parse( alignName2 );
if ( debug > 2 ) System.err.println(" Alignment structure2 parsed");
// Create evaluator object
eval = new PRecEvaluator( align1, align2 );
diff --git a/src/fr/inrialpes/exmo/align/util/GroupOutput.java b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
index dbf7e80a..57c70051 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupOutput.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
@@ -264,11 +264,11 @@ public class GroupOutput {
// Load alignments
Alignment align1=null, align2=null;
try {
- AlignmentParser aparser1 = new AlignmentParser( nextdebug );
- align1 = aparser1.parse( alignName1 );
+ AlignmentParser aparser = new AlignmentParser( nextdebug );
+ align1 = aparser.parse( alignName1 );
if ( debug > 2 ) System.err.println(" Alignment structure1 parsed");
- AlignmentParser aparser2 = new AlignmentParser( nextdebug );
- align2 = aparser2.parse( alignName2 );
+ aparser.initAlignment( null );
+ align2 = aparser.parse( alignName2 );
if ( debug > 2 ) System.err.println(" Alignment structure2 parsed");
} catch (Exception ex) {
throw new AlignmentException( "Cannot parse ", ex );
--
GitLab