Author: laylaoesper
Date: 2010-08-05 09:49:42 -0700 (Thu, 05 Aug 2010)
New Revision: 21218
Modified:
csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/ClusterPriorityQueue.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudNetworkAction.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SingleWordCluster.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordDelimiters.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordPair.java
Log:
Fix issue with removing space as a delimiter.
Modified: csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
===================================================================
(Binary files differ)
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -330,7 +330,7 @@
if (!lastWord.equals(""))
{
Integer curPairCount =
0;
- String pairName =
lastWord + " " + curWord;
+ String pairName =
lastWord + controlChar + curWord;
if
(networkPairCounts.containsKey(pairName))
curPairCount =
networkPairCounts.get(pairName);
@@ -429,7 +429,7 @@
if (!lastWord.equals(""))
{
Integer curPairCount =
0;
- String pairName =
lastWord + " " + curWord;
+ String pairName =
lastWord + controlChar + curWord;
if
(selectedPairCounts.containsKey(pairName))
curPairCount =
selectedPairCounts.get(pairName);
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/ClusterPriorityQueue.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/ClusterPriorityQueue.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/ClusterPriorityQueue.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -46,6 +46,8 @@
private CloudParameters params;
private boolean initialized;
+ private static final char controlChar = '\u001F';
+
//CONSTRUCTORS
/**
* Creates a fresh instance of the priority queue.
@@ -75,8 +77,8 @@
for (Iterator<String> iter = pairNames.iterator();
iter.hasNext();)
{
String curName = iter.next();
- String first = curName.split(" ")[0];
- String second = curName.split(" ")[1];
+ String first =
curName.split(Character.toString(controlChar))[0];
+ String second =
curName.split(Character.toString(controlChar))[1];
WordPair curPair = new WordPair(first, second, params);
curPair.calculateProbability();
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudNetworkAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudNetworkAction.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudNetworkAction.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -56,6 +56,7 @@
public static String WORD_VAL = "Word_Prob";
public static String CO_VAL = "CO_Prob";
public static String INTERACTION_TYPE = "CO";
+ private static final char controlChar = '\u001F';
//CONSTRUCTORS
@@ -106,7 +107,7 @@
{
String curEdge = iter.next();
Double edgeRatio = pairRatios.get(curEdge);
- String[] nodeNames = curEdge.split(" ");
+ String[] nodeNames =
curEdge.split(Character.toString(controlChar));
String nodeName1 = nodeNames[0];
String nodeName2 = nodeNames[1];
Node node1 = Cytoscape.getCyNode(nodeName1, false);
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SingleWordCluster.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SingleWordCluster.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SingleWordCluster.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -142,7 +142,9 @@
}
/**
- * Calculates a weighted sum for all words.
+ * Calculates a weighted sum for all words. The sum is the square root
+ * of the sum of squares of the font size of all words in the cluster.
+ * @return the weighted sum of all words in the cluster
*/
public Double calculateWeightedSum()
{
@@ -161,77 +163,11 @@
return sum;
}
-
- /**
- * Compares two SingleWordClusters based on the totalSum of the font
sizes,
- * and then breaks ties based upon alphabetical sorting of the words
- * in the list.
- */
- /*
- public int compareTo(SingleWordCluster o)
- {
- //Integer thisCount = this.getTotalSum();
- //Integer compareCount = o.getTotalSum();
-
- Double thisCount = this.computeRootMean();
- Double compareCount = o.computeRootMean();
-
- if (thisCount < compareCount)
- {return -1;}
- else if (thisCount > compareCount)
- {return 1;}
- else
- {
- //In case of ties, break alphabetically by first word
- String thisWord = this.getWordList().get(0);
- String compareWord = this.getWordList().get(0);
-
- return thisWord.compareTo(compareWord);
- }
- }
- */
- /**
- * Largest word first, then total, then alphabetical
- */
- /*
- public int compareTo(SingleWordCluster o)
- {
- Integer thisLargest = this.getLargestFont();
- Integer compareLargest = o.getLargestFont();
-
- if (thisLargest < compareLargest)
- {return -1;}
- else if (thisLargest > compareLargest)
- {return 1;}
- else
- {
- //In case of ties, break by total
- Integer thisCount = this.getTotalSum();
- Integer compareCount = o.getTotalSum();
-
- if (thisCount < compareCount)
- {return -1;}
- else if (thisCount > compareCount)
- {return 1;}
- else
- {
-
- //In case of ties, break alphabetically by
first word
- String thisWord = this.getWordList().get(0);
- String compareWord = this.getWordList().get(0);
-
- return thisWord.compareTo(compareWord);
- }
- }
- }
- */
-
+
//Weighted sum
public int compareTo(SingleWordCluster o)
{
- //Integer thisCount = this.getTotalSum();
- //Integer compareCount = o.getTotalSum();
-
+ //Sort first based on weighted sum
Double thisCount = this.calculateWeightedSum();
Double compareCount = o.calculateWeightedSum();
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordDelimiters.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordDelimiters.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordDelimiters.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -102,7 +102,7 @@
regexTranslation.put("carriage return", "\\r");
regexTranslation.put("form feed", "\\f");
regexTranslation.put("!","!");
- regexTranslation.put("\"", "\" ");
+ regexTranslation.put("\"", "\"");
regexTranslation.put("#", "#");
regexTranslation.put("$", "$");
regexTranslation.put("%", "%");
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordPair.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordPair.java
2010-08-05 15:55:37 UTC (rev 21217)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/WordPair.java
2010-08-05 16:49:42 UTC (rev 21218)
@@ -36,6 +36,7 @@
private String secondWord;
private Double probability;
private CloudParameters params;
+ private static final char controlChar = '\u001F';
//CONSTRUCTOR
/**
@@ -68,7 +69,7 @@
Integer total = params.getSelectedNumNodes();
Integer firstCount = params.getSelectedCounts().get(firstWord);
Integer secondCount =
params.getSelectedCounts().get(secondWord);
- String pairName = firstWord + " " + secondWord;
+ String pairName = firstWord + controlChar + secondWord;
Integer pairCount =
params.getSelectedPairCounts().get(pairName);
Integer numerator = pairCount * total;
@@ -147,7 +148,7 @@
public String getWordPairing()
{
- return firstWord + " " + secondWord;
+ return firstWord + controlChar + secondWord;
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
