1 files changed, 46 insertions, 48 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
index cd86282..7220533 100644
--- a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
+++ b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
@@ -22,10 +22,11 @@ import java.util.regex.Pattern;
 public class AnswerTuple {
         
         public static final String SEPARATOR = "\t";
+        static final Pattern owlLiteralRegex =
+                        Pattern.compile("^\"(?<lexicalForm>[^@]+(@(?<langTag>.+))?)\"(^^<(?<dataType>.+)>)?$");
+        String m_str = null;
+        GroundTerm[] m_tuple;
         
-        String m_str = null; 
-        GroundTerm[] m_tuple; 
-
         public AnswerTuple(TupleIterator iter, int arity) {
                 m_tuple = new GroundTerm[arity];
                 try {
@@ -33,24 +34,29 @@ public class AnswerTuple {
                                 m_tuple[i] = iter.getGroundTerm(i);
                 } catch (JRDFStoreException e) {
                         e.printStackTrace();
-                } 
+                }
         }
         
         public AnswerTuple(GroundTerm[] terms) {
-                m_tuple = terms; 
-        }
-        
-        private AnswerTuple(AnswerTuple sup, int arity) {
-                m_tuple = new GroundTerm[arity]; 
-                for (int i = 0; i < arity; ++i) m_tuple[i] = sup.m_tuple[i]; 
+                m_tuple = terms;
         }
 
 //      private AnswerTuple(String m_str) {
 //              this.m_str = m_str;
 //      }
+
+        private AnswerTuple(AnswerTuple sup, int arity) {
+                m_tuple = new GroundTerm[arity];
+                for(int i = 0; i < arity; ++i) m_tuple[i] = sup.m_tuple[i];
+        }
+
+        public static AnswerTuple create(AnswerTuple extendedTuple, int length) {
+                if(length == extendedTuple.getArity()) return extendedTuple;
+                else return new AnswerTuple(extendedTuple, length);
+        }
         
         public int getArity() {
-                return m_tuple.length; 
+                return m_tuple.length;
         }
 
         public int hashCode() {
@@ -60,7 +66,7 @@ public class AnswerTuple {
                         code = code * 1997 + m_tuple[i].hashCode();
                 return code;
         }
-        
+
         public boolean equals(Object obj) {
                 if (!(obj instanceof AnswerTuple)) return false;
                 AnswerTuple that = (AnswerTuple) obj;
@@ -73,8 +79,8 @@ public class AnswerTuple {
         }
         
         public String toString() {
-                if (m_str != null) return m_str; 
-                StringBuilder sb = new StringBuilder();  
+                if(m_str != null) return m_str;
+                StringBuilder sb = new StringBuilder();
                 for (int i = 0; i < m_tuple.length; ++i) {
                         if (sb.length() != 0) sb.append(SEPARATOR);
                         if (m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.Individual)
@@ -83,64 +89,58 @@ public class AnswerTuple {
                                 sb.append(m_tuple[i].toString());
                         }
                         else {
-                                Literal l = (Literal) m_tuple[i]; 
+                                Literal l = (Literal) m_tuple[i];
                                 sb.append('"').append(l.getLexicalForm()).append("\"");
                                 if (!l.getDatatype().equals(Datatype.XSD_STRING) && !l.getDatatype().equals(Datatype.RDF_PLAIN_LITERAL))
-                                        sb.append("^^<").append(l.getDatatype().getIRI()).append(">"); 
+                                        sb.append("^^<").append(l.getDatatype().getIRI()).append(">");
                         }
                 }
-                return m_str = sb.toString();  
+                return m_str = sb.toString();
         }
 
         public GroundTerm getGroundTerm(int i) {
-                return m_tuple[i]; 
+                return m_tuple[i];
         }
         
         public Map<Variable, Term> getAssignment(String[] vars) {
-                Map<Variable, Term> map = new HashMap<Variable, Term>(); 
-                int index = 0; 
-                Term t; 
+                Map<Variable, Term> map = new HashMap<Variable, Term>();
+                int index = 0;
+                Term t;
                 for (String var: vars) {
-                        if (m_tuple[index] instanceof uk.ac.ox.cs.JRDFox.model.Individual) 
-                                t = Individual.create((((uk.ac.ox.cs.JRDFox.model.Individual) m_tuple[index]).getIRI())); 
+                        if(m_tuple[index] instanceof uk.ac.ox.cs.JRDFox.model.Individual)
+                                t = Individual.create((((uk.ac.ox.cs.JRDFox.model.Individual) m_tuple[index]).getIRI()));
                         else {
-                                uk.ac.ox.cs.JRDFox.model.Literal l = (uk.ac.ox.cs.JRDFox.model.Literal) m_tuple[index]; 
-                                t = Constant.create(l.getLexicalForm(), l.getDatatype().getIRI()); 
+                                uk.ac.ox.cs.JRDFox.model.Literal l = (uk.ac.ox.cs.JRDFox.model.Literal) m_tuple[index];
+                                t = Constant.create(l.getLexicalForm(), l.getDatatype().getIRI());
                         }
-                        map.put(Variable.create(var), t); 
-                        ++index; 
+                        map.put(Variable.create(var), t);
+                        ++index;
                 }
-                return map; 
+                return map;
         }
 
         public boolean hasAuxPredicate() {
-                String iri; 
+                String iri;
                 for (int i = 0; i < m_tuple.length; ++i)
                         if ((m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.Individual)) {
                                 iri = ((uk.ac.ox.cs.JRDFox.model.Individual) m_tuple[i]).getIRI();
-                                if ( iri.startsWith(Namespace.PAGODA_AUX) || iri.contains("_AUX") || iri.contains("_neg") || iri.contains("internal:def"))
-                                        return true; 
+                                if(iri.startsWith(Namespace.PAGODA_AUX) || iri.contains("_AUX") || iri.contains("_neg") || iri.contains("internal:def"))
+                                        return true;
                         }
-                return false; 
+                return false;
         }
-        
-        public boolean hasAnonyIndividual() {
-                String iri; 
-                for (int i = 0; i < m_tuple.length; ++i)
-                        if ((m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.Individual)) {
+
+        public boolean hasAnonymousIndividual() {
+                String iri;
+                for(int i = 0; i < m_tuple.length; ++i)
+                        if((m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.Individual)) {
                                 iri = ((uk.ac.ox.cs.JRDFox.model.Individual) m_tuple[i]).getIRI();
-                                if (iri.startsWith(Namespace.PAGODA_ANONY) || iri.startsWith(Namespace.KARMA_ANONY))
-                                        return true; 
+                                if(iri.startsWith(Namespace.PAGODA_ANONY) || iri.startsWith(Namespace.KARMA_ANONY))
+                                        return true;
                         }
-                return false; 
+                return false;
         }
 
-        public static AnswerTuple create(AnswerTuple extendedTuple, int length) {
-                if (length == extendedTuple.getArity()) return extendedTuple;
-                else return new AnswerTuple(extendedTuple, length); 
-        }
-
-
         public static class AnswerTupleSerializer implements JsonSerializer<AnswerTuple> {
 
                 public JsonElement serialize(AnswerTuple src, Type typeOfSrc, JsonSerializationContext context) {
@@ -149,8 +149,6 @@ public class AnswerTuple {
 
         }
 
-        static final Pattern owlLiteralRegex = Pattern.compile("^\"(?<lexicalForm>[^@]+(@(?<langTag>.+))?)\"(^^<(?<dataType>.+)>)?$");
-
         public static class AnswerTupleDeserializer implements JsonDeserializer<AnswerTuple> {
                 public AnswerTuple deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
                                 throws JsonParseException {