source: java/main/src/main/java/com/framsticks/model/Genotype.java @ 84

Last change on this file since 84 was 84, checked in by psniegowski, 11 years ago

HIGHLIGHTS:

  • simplification of entities management model
  • cleanup around params (improve hierarchy)
  • migrate from JUnit to TestNG
  • introduce FEST to automatically test GUI
  • improve slider control
  • loosen synchronization between gui tree and backend representation
  • and many other bug fixes

NOTICE:

  • a great many of lines is changed only because of substituting spaces with tabs

CHANGELOG (oldest changes at the bottom):

Some cleaning after fix found.

Fix bug with tree.

More changes with TreeNodes?.

Finally fix issue with tree.

Improve gui tree management.

Decouple update of values from fetch request in gui.

Minor changes.

Minor changes.

Minor change.

Change Path construction wording.

More fixes to SliderControl?.

Fix SliderControl?.

Fix SliderControl?.

Minor improvement.

Several changes.

Make NumberParam? a generic class.

Add robot to the gui test.

Setup common testing logging configuration.

Remove Parameters class.

Remove entityOwner from Parameters.

Move name out from Parameters class.

Move configuration to after the construction.

Simplify observers and endpoints.

Remove superfluous configureEntity overrides.

Add dependency on fest-swing-testng.

Use FEST for final print test.

Use FEST for more concise and readable assertions.

Divide test of F0Parser into multiple methods.

Migrate to TestNG

Minor change.

Change convention from LOGGER to log.

Fix reporting of errors during controls filling.

Bound maximal height of SliderControl?.

Minor improvements.

Improve tooltips for controls.

Also use Delimeted in more places.

Move static control utilities to Gui.

Rename package gui.components to controls.

Some cleaning in controls.

Improve Param classes placing.

Move ValueParam?, PrimitiveParam? and CompositeParam? one package up.

Improve ParamBuilder?.

Move getDef to ValueParam? and PrimitiveParam?.

Move getMax and getDef to ValueParam?.

Move getMin to ValueParam?.

Upgrade to laters apache commons versions.

Use filterInstanceof extensively.

Add instanceof filters.

Make ValueParam? in many places of Param.

Place assertions about ValueParam?.

Add ValueParam?

Rename ValueParam? to PrimitiveParam?

Minor changes.

Several improvements to params types.

Add NumberParam?.

Add TextControl? component.

Add .swp files to .gitignore

Greatly improved slider component.

Some improvements.

Make Param.reassign return also a state.

Add IterableIterator?.

Several changes.

  • Move util classes to better packages.
  • Remove warnings from eclim.

Several improvements.

Fix bug with BooleanParam?.

Some experiments with visualization.

Another fix to panel management.

Improve panel management.

Some refactorization around panels.

Add root class for panel.
File size: 2.4 KB
Line 
1package com.framsticks.model;
2
3
4// import org.apache.log4j.Logger;
5
6public class Genotype extends Model {
7        // private final static Logger log = Logger.getLogger(Genotype.class);
8
9        public String name;
10        public String genotype;
11        public String info;
12
13        public Double similarity;
14        public Double getSimi() { return similarity; }
15        public void setSimi(Double simi) { similarity = simi; }
16
17        public Double brainConnections;
18        public Double getNumconnections() { return brainConnections; }
19        public void setNumconnections(Double numconnections) { brainConnections = numconnections; }
20
21    public Integer ordinalNumber;
22        public Integer getNum() { return ordinalNumber; }
23        public void setNum(Integer num) { ordinalNumber = num; }
24
25    public Integer generation;
26        public Integer getGnum() { return generation; }
27        public void setGnum(Integer gnum) { generation = gnum; }
28
29        public Integer instances;
30
31        public Integer lifeSpan;
32        public Integer getLifespan() { return lifeSpan; }
33        public void setLifespan(Integer lifespan) { lifeSpan = lifespan; }
34
35        public Double velocity;
36        public Double distance;
37
38        public Double verticalVelocity;
39        public Double getVertvel() { return verticalVelocity; }
40        public void setVertvel(Double vertvel) { verticalVelocity = vertvel; }
41
42        public Double verticalPosition;
43        public Double getVertpos() { return verticalPosition; }
44        public void setVertpos(Double vertpos) { verticalPosition = vertpos; }
45
46        public Double fitness;
47        public Double getFit() { return fitness; }
48        public void setFit(Double fit) { fitness = fit; }
49
50        public Double finalFitness;
51        public Double getFit2() { return finalFitness; }
52        public void setFit2(Double fit2) { finalFitness = fit2; }
53
54        public String genotypeInF0;
55        public String getF0genotype() { return genotypeInF0; }
56        public void setF0genotype(String f0genotype) { genotypeInF0 = f0genotype; }
57
58        public String conversionBacktrace;
59        public String getConvtrace1() { return conversionBacktrace; }
60        public void setConvtrace1(String convtrace1) { conversionBacktrace = convtrace1; }
61
62        public Object[] userFields = new Object[3];
63        public Object getUser1() { return userFields[0]; }
64        public void setUser1(Object user1) { userFields[0] = user1; }
65
66        public Object getUser2() { return userFields[1]; }
67        public void setUser2(Object user2) { userFields[1] = user2; }
68
69        public Object getUser3() { return userFields[2]; }
70        public void setUser3(Object user3) { userFields[2] = user3; }
71
72        public String uid;
73
74}
75
Note: See TracBrowser for help on using the repository browser.