Skip to content

Commit

Permalink
GeneticMakeupImpl fix - use gene.getId for map keys.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iceraj
iceraj committed Jan 23, 2014
1 parent 27918a6 commit ea35a05
Show file tree
Hide file tree
Showing 11 changed files with 240 additions and 301 deletions.
2 changes: 1 addition & 1 deletion src/star/genetics/client/messages_en.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#en
#Thu Jan 23 13:26:22 EST 2014
#Thu Jan 23 15:37:48 EST 2014
GroupBy.4={0} ({1}%)
GroupBy.3=<html><b>Male</b></html>
Cow.0=m\:
Expand Down
17 changes: 13 additions & 4 deletions src/star/genetics/genetic/impl/GeneticMakeupImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package star.genetics.genetic.impl;

import java.util.logging.Level;
import java.util.logging.Logger;

import star.genetics.client.Helper;
import star.genetics.genetic.model.Allele;
import star.genetics.genetic.model.Chromosome;
Expand All @@ -13,6 +16,7 @@

public class GeneticMakeupImpl implements star.genetics.genetic.model.GeneticMakeup
{

private static final long serialVersionUID = 1L;
private final JSONObject data;
private final Model model;
Expand Down Expand Up @@ -43,10 +47,11 @@ public JSONObject getJSON()

public String toStr(Gene g)
{
JSONObject ret = new JSONObject();
ret.put("chromosome", Helper.wrapString(g.getChromosome().getName()));
ret.put("gene", Helper.wrapString(g.getName()));
return ret.toString();
// JSONObject ret = new JSONObject();
// ret.put("chromosome", Helper.wrapString(g.getChromosome().getName()));
// ret.put("gene", Helper.wrapString(g.getName()));
// return ret.toString();
return g.getId();
}

public void put(Gene g, DiploidAlleles d)
Expand Down Expand Up @@ -117,6 +122,7 @@ public boolean equals(Object other)

private boolean test(Allele a, Allele b, Allele x, Allele y)
{

boolean ax, by;
if (a != null)
{
Expand Down Expand Up @@ -144,6 +150,7 @@ private boolean test(RuleMakeup map, boolean swap)
{
for (String s : map.keySet())
{

DiploidAlleles rule = map.get(s);
DiploidAlleles organism = get(s);
// for (Entry<Gene, DiploidAlleles> entry : map.entrySet())
Expand All @@ -163,6 +170,7 @@ private boolean test(RuleMakeup map, boolean swap)
Allele o1 = organism.get(1);

ret &= test(r0, r1, o0, o1);

if (!ret)
{
break;
Expand All @@ -173,6 +181,7 @@ private boolean test(RuleMakeup map, boolean swap)
{
throw new RuntimeException(e);
}

return ret;
}

Expand Down
4 changes: 2 additions & 2 deletions src/star/genetics/genetic/impl/RuleMakeup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ public JSONObject getJSON()

public void put(Gene g, DiploidAlleles d)
{
String gene_str = g.getJSON().toString();
String gene_str = g.getId();
data.get(MAKEUP).isObject().put(gene_str, d.getJSON());
}

public DiploidAlleles get(Gene g)
{
return new DiploidAllelesImpl(data.get(MAKEUP).isObject().get(g.getJSON().toString()).isObject(), getModel());
return new DiploidAllelesImpl(data.get(MAKEUP).isObject().get(g.getId()).isObject(), getModel());
}

public DiploidAlleles get(String g)
Expand Down
4 changes: 3 additions & 1 deletion src/star/genetics/genetic/model/Gene.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.io.Serializable;

import com.google.gwt.json.client.JSONObject;

import star.genetics.client.JSONable;
import star.genetics.client.JSONableList;

Expand All @@ -18,5 +20,5 @@ public interface Gene extends Serializable, Comparable<Gene>, JSONable
String getName();

float getPosition();

}
80 changes: 34 additions & 46 deletions ...8BEB19E26CB205E644BD835303BF76.cache.html → ...0A311AB073EB52A568F9DEE95D1D07.cache.html
View file

Large diffs are not rendered by default.

84 changes: 36 additions & 48 deletions ...36B8C2269A98AC52410FA647872BB1.cache.html → ...AB46F9655C0D949E1B0685A5DACE6D.cache.html
View file

Large diffs are not rendered by default.

80 changes: 34 additions & 46 deletions ...3B2E75989A625D11102516803CE873.cache.html → ...A9FCBCF6606E5F4D0C3827A5871FF9.cache.html
View file

Large diffs are not rendered by default.

84 changes: 36 additions & 48 deletions ...80FD853408F8E48968E7E505234296.cache.html → ...F1E671F7BC54C1E43FEF5F28BD148F.cache.html
View file

Large diffs are not rendered by default.

92 changes: 40 additions & 52 deletions ...EF18AD56F06C4E0ACF4119374C285C.cache.html → ...386FE22E08045D01CC0D0D25359B64.cache.html
View file

Large diffs are not rendered by default.

80 changes: 34 additions & 46 deletions ...15333D05149A6B5429D3FF37CD9A19.cache.html → ...D33B432463733005AAA3E31FD578C0.cache.html
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions war/stargenetics_gwt_java/stargenetics_gwt_java.nocache.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function stargenetics_gwt_java(){
var $intern_0 = '', $intern_36 = '" for "gwt:onLoadErrorFn"', $intern_34 = '" for "gwt:onPropertyErrorFn"', $intern_21 = '"><\/script>', $intern_10 = '#', $intern_62 = '.cache.html', $intern_12 = '/', $intern_24 = '//', $intern_55 = '0336B8C2269A98AC52410FA647872BB1', $intern_56 = '1A15333D05149A6B5429D3FF37CD9A19', $intern_57 = '5080FD853408F8E48968E7E505234296', $intern_58 = '6AEF18AD56F06C4E0ACF4119374C285C', $intern_59 = '7D3B2E75989A625D11102516803CE873', $intern_60 = '8B8BEB19E26CB205E644BD835303BF76', $intern_61 = ':', $intern_28 = '::', $intern_70 = '<script defer="defer">stargenetics_gwt_java.onInjectionDone(\'stargenetics_gwt_java\')<\/script>', $intern_20 = '<script id="', $intern_31 = '=', $intern_11 = '?', $intern_33 = 'Bad handler "', $intern_69 = 'DOMContentLoaded', $intern_22 = 'SCRIPT', $intern_19 = '__gwt_marker_stargenetics_gwt_java', $intern_23 = 'base', $intern_15 = 'baseUrl', $intern_4 = 'begin', $intern_3 = 'bootstrap', $intern_14 = 'clear.cache.gif', $intern_30 = 'content', $intern_9 = 'end', $intern_49 = 'gecko', $intern_50 = 'gecko1_8', $intern_5 = 'gwt.codesvr=', $intern_6 = 'gwt.hosted=', $intern_7 = 'gwt.hybrid', $intern_63 = 'gwt/clean/clean.css', $intern_35 = 'gwt:onLoadErrorFn', $intern_32 = 'gwt:onPropertyErrorFn', $intern_29 = 'gwt:property', $intern_68 = 'head', $intern_53 = 'hosted.html?stargenetics_gwt_java', $intern_67 = 'href', $intern_48 = 'ie6', $intern_47 = 'ie8', $intern_46 = 'ie9', $intern_37 = 'iframe', $intern_13 = 'img', $intern_38 = "javascript:''", $intern_64 = 'link', $intern_52 = 'loadExternalRefs', $intern_25 = 'meta', $intern_40 = 'moduleRequested', $intern_8 = 'moduleStartup', $intern_45 = 'msie', $intern_26 = 'name', $intern_42 = 'opera', $intern_39 = 'position:absolute;width:0;height:0;border:none', $intern_65 = 'rel', $intern_44 = 'safari', $intern_16 = 'script', $intern_54 = 'selectingPermutation', $intern_1 = 'stargenetics_gwt_java', $intern_17 = 'stargenetics_gwt_java.nocache.js', $intern_27 = 'stargenetics_gwt_java::', $intern_2 = 'startup', $intern_66 = 'stylesheet', $intern_18 = 'undefined', $intern_51 = 'unknown', $intern_41 = 'user.agent', $intern_43 = 'webkit';
var $intern_0 = '', $intern_36 = '" for "gwt:onLoadErrorFn"', $intern_34 = '" for "gwt:onPropertyErrorFn"', $intern_21 = '"><\/script>', $intern_10 = '#', $intern_62 = '.cache.html', $intern_12 = '/', $intern_24 = '//', $intern_55 = '030A311AB073EB52A568F9DEE95D1D07', $intern_56 = '34AB46F9655C0D949E1B0685A5DACE6D', $intern_57 = '4CA9FCBCF6606E5F4D0C3827A5871FF9', $intern_58 = '81F1E671F7BC54C1E43FEF5F28BD148F', $intern_59 = '9B386FE22E08045D01CC0D0D25359B64', $intern_61 = ':', $intern_28 = '::', $intern_70 = '<script defer="defer">stargenetics_gwt_java.onInjectionDone(\'stargenetics_gwt_java\')<\/script>', $intern_20 = '<script id="', $intern_31 = '=', $intern_11 = '?', $intern_33 = 'Bad handler "', $intern_69 = 'DOMContentLoaded', $intern_60 = 'E4D33B432463733005AAA3E31FD578C0', $intern_22 = 'SCRIPT', $intern_19 = '__gwt_marker_stargenetics_gwt_java', $intern_23 = 'base', $intern_15 = 'baseUrl', $intern_4 = 'begin', $intern_3 = 'bootstrap', $intern_14 = 'clear.cache.gif', $intern_30 = 'content', $intern_9 = 'end', $intern_49 = 'gecko', $intern_50 = 'gecko1_8', $intern_5 = 'gwt.codesvr=', $intern_6 = 'gwt.hosted=', $intern_7 = 'gwt.hybrid', $intern_63 = 'gwt/clean/clean.css', $intern_35 = 'gwt:onLoadErrorFn', $intern_32 = 'gwt:onPropertyErrorFn', $intern_29 = 'gwt:property', $intern_68 = 'head', $intern_53 = 'hosted.html?stargenetics_gwt_java', $intern_67 = 'href', $intern_48 = 'ie6', $intern_47 = 'ie8', $intern_46 = 'ie9', $intern_37 = 'iframe', $intern_13 = 'img', $intern_38 = "javascript:''", $intern_64 = 'link', $intern_52 = 'loadExternalRefs', $intern_25 = 'meta', $intern_40 = 'moduleRequested', $intern_8 = 'moduleStartup', $intern_45 = 'msie', $intern_26 = 'name', $intern_42 = 'opera', $intern_39 = 'position:absolute;width:0;height:0;border:none', $intern_65 = 'rel', $intern_44 = 'safari', $intern_16 = 'script', $intern_54 = 'selectingPermutation', $intern_1 = 'stargenetics_gwt_java', $intern_17 = 'stargenetics_gwt_java.nocache.js', $intern_27 = 'stargenetics_gwt_java::', $intern_2 = 'startup', $intern_66 = 'stylesheet', $intern_18 = 'undefined', $intern_51 = 'unknown', $intern_41 = 'user.agent', $intern_43 = 'webkit';
var $wnd = window, $doc = document, $stats = $wnd.__gwtStatsEvent?function(a){
return $wnd.__gwtStatsEvent(a);
}
Expand Down Expand Up @@ -300,12 +300,12 @@ function stargenetics_gwt_java(){
$stats && $stats({moduleName:$intern_1, sessionId:$sessionId, subSystem:$intern_2, evtGroup:$intern_3, millis:(new Date).getTime(), type:$intern_54});
if (!isHostedMode()) {
try {
unflattenKeylistIntoAnswers([$intern_47], $intern_55);
unflattenKeylistIntoAnswers([$intern_42], $intern_56);
unflattenKeylistIntoAnswers([$intern_48], $intern_57);
unflattenKeylistIntoAnswers([$intern_44], $intern_58);
unflattenKeylistIntoAnswers([$intern_46], $intern_59);
unflattenKeylistIntoAnswers([$intern_50], $intern_60);
unflattenKeylistIntoAnswers([$intern_50], $intern_55);
unflattenKeylistIntoAnswers([$intern_47], $intern_56);
unflattenKeylistIntoAnswers([$intern_46], $intern_57);
unflattenKeylistIntoAnswers([$intern_48], $intern_58);
unflattenKeylistIntoAnswers([$intern_44], $intern_59);
unflattenKeylistIntoAnswers([$intern_42], $intern_60);
strongName = answers[computePropValue($intern_41)];
var idx = strongName.indexOf($intern_61);
if (idx != -1) {
Expand Down

0 comments on commit ea35a05

Please sign in to comment.