summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkrasimir <krasimir@chalmers.se>2015-11-24 20:22:01 +0000
committerkrasimir <krasimir@chalmers.se>2015-11-24 20:22:01 +0000
commit55cfea35eb7840b4d34ed5476bae87204a80acb1 (patch)
tree04a8f7e83c6b37ebc17b21421e113f0447901ed5 /src
parent9b742e6b0d710b896ab3cceafd2c901b3ca464cc (diff)
the semantic graph view in the app now shows the real number of senses
Diffstat (limited to 'src')
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraph.java14
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraphActivity.java2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraph.java b/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraph.java
index 50f83bda0..0033404c9 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraph.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraph.java
@@ -21,10 +21,10 @@ public class SemanticGraph {
layoutMaxY = 0;
}
- public Node addNode(String lemma) {
+ public Node addNode(String lemma, List senses) {
Node n = nodes.get(lemma);
if (n == null) {
- n = new Node(lemma, new String[(int) (10*Math.random())]);
+ n = new Node(lemma, senses);
}
nodes.put(lemma,n);
return n;
@@ -182,7 +182,7 @@ public class SemanticGraph {
public static class Node {
private String lemma;
- private String[] senses;
+ private List senses;
private float layoutPosX;
private float layoutPosY;
@@ -190,7 +190,7 @@ public class SemanticGraph {
private float layoutForceY;
- private Node(String lemma, String[] senses) {
+ private Node(String lemma, List senses) {
this.lemma = lemma;
this.senses = senses;
@@ -205,11 +205,11 @@ public class SemanticGraph {
}
public int getSenseCount() {
- return senses.length;
+ return senses.size();
}
- public String getSenseId(int i) {
- return senses[i];
+ public Object getSenseId(int i) {
+ return senses.get(i);
}
public float getLayoutX() {
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraphActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraphActivity.java
index 893f023b2..38878cc50 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraphActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/SemanticGraphActivity.java
@@ -94,7 +94,7 @@ public class SemanticGraphActivity extends Activity {
Toast toast = Toast.makeText(this, "\""+query+"\" doesn't match", Toast.LENGTH_SHORT);
toast.show();
} else {
- mGraphView.getGraph().addNode(query);
+ mGraphView.getGraph().addNode(query, list);
mGraphView.refresh();
}
}