Ignore:
Timestamp:
09/23/13 18:54:07 (11 years ago)
Author:
psniegowski
Message:

HIGHLIGHTS:

  • add SimultorProviders? hierarchy
  • start Framsticks server over SSH
  • FJF compatible with Framsticks 4.0rc3
  • reading and writing of standard.expt
  • a proof-of-concept implementation of StandardExperiment?

CHANGELOG:
Optionally return FreeAccess? from registry.

Add SimulatorRange?.

StandardExperiment? with genotypes circulation.

Automate registration around StandardState?.

More improvements to StandardExperiment?.

Skeleton version of StandardExperiment?.

Test saving of StandardState?.

Standard experiment state is being loaded.

More development towards StandardState? reading.

Work on reading standard experiment state.

Add classes for standard experiment.

Update example standard.expt

Add FreeAccess? and FreeObject?.

Made compatible with version 4.0rc3

Change deserialization policy.

Improve SSH support.

Working running simulator over SSH.

Fix joining bug in Experiment.

Working version of SimulatorRunner?.

Add more SimulatorProviders?.

Working PrimeExperimentTest? with 4.0rc3

Add references to deserialization.

Add OpaqueObject? and it's serialization.

Add deserialization of dictionaries.

Partial implementation of deserialization.

Add more tests for deserialization.

Prepare tests for deserialization.

Add proper result to prime experiment test.

Minor fixes to simulators providers.

Draft version of SimulatorProvider?.

Add SimulatorProvider? interface.

Location:
java/main/src/test/resources
Files:
2 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • java/main/src/test/resources/configs/PrimeExperimentTest.xml

    r102 r107  
    22<Framsticks>
    33        <import class="com.framsticks.test.PrimeExperiment" />
    4         <import class="com.framsticks.experiment.Simulator" />
    5         <import class="com.framsticks.util.dispatching.StackedJoinable" />
    6         <import class="com.framsticks.util.dispatching.JoinableCollection" />
    7         <import class="com.framsticks.running.LoggingOutputListener" />
    8         <import class="com.framsticks.running.FramsServer" />
    94        <import class="com.framsticks.experiment.SimulatorConnector" />
    10         <StackedJoinable interval="1">
    11                 <JoinableCollection name="servers">
    12                         <FramsServer name="frams" port="9100" expdef="prime">
    13                                 <LoggingOutputListener />
    14                         </FramsServer>
    15                         <FramsServer name="frams" port="9101" expdef="prime">
    16                                 <LoggingOutputListener />
    17                         </FramsServer>
    18                 </JoinableCollection>
    19                 <PrimeExperiment>
    20                         <SimulatorConnector address="localhost:9100" />
    21                         <SimulatorConnector address="localhost:9101" />
    22                 </PrimeExperiment>
    23         </StackedJoinable>
     5        <import class="com.framsticks.experiment.SimulatorGroup" />
     6        <import class="com.framsticks.experiment.SimulatorRunner" />
     7        <import class="com.framsticks.experiment.SimulatorRange" />
     8        <PrimeExperiment>
     9                <SimulatorRange hosts='@Serialized:["localhost"]' ports='@Serialized:[9100,9101,9102]' run="true"/>
     10                <!-- <SimulatorGroup> -->
     11                <!--    <SimulatorRunner address="localhost:9100" /> -->
     12                <!--    <SimulatorRunner address="localhost:9101" /> -->
     13                <!--    <SimulatorRunner address="localhost:9102" /> -->
     14                <!-- </SimulatorGroup> -->
     15        </PrimeExperiment>
    2416</Framsticks>
  • java/main/src/test/resources/log4j2.xml

    r103 r107  
    99                <logger name="com.framsticks" level="info" />
    1010                <logger name="com.framsticks.test.TestConfiguration" level="info" />
     11                <logger name="com.framsticks.standard" level="debug" />
     12                <!-- <logger name="com.framsticks.experiment" level="debug" /> -->
     13                <!-- <logger name="com.framsticks.test.PrimeExperiment" level="debug" /> -->
    1114
    1215                <!-- <logger name="com.framsticks.running.ExternalProcess" level="debug" /> -->
     
    1518                <!-- <logger name="com.framsticks.experiment.NetLoadSaveLogic" level="debug" /> -->
    1619                <!-- <logger name="com.framsticks.experiment.WorkPackageLogic" level="debug" /> -->
    17                 <!-- <logger name="com.framsticks.params.AccessOperations" level="debug" /> -->
     20                <!-- <logger name="com.framsticks.params.AccessOperations" level="trace" /> -->
    1821                <!-- <logger name="com.framsticks.util.dispatching.AbstractJoinable" level="debug" /> -->
    1922                <!-- <logger name="com.framsticks.util.dispatching.AbstractJoinable.Report" level="info" /> -->
  • java/main/src/test/resources/netfiles/standard.expt

    r105 r107  
    55overwrite:1
    66filecomm:1
     7lastCheckpoint:@Serialized:165
    78createrr:1
    89creatwarnfail:0
     
    1112groupchk:0
    1213resetonexpdef:1
     14user:@Serialized:null
     15identity:-1
    1316initialgen:X
    1417capacity:200
     
    1720rotation:0
    1821creath:0.1
    19 p_nop:20
     22p_nop:20.0
    2023evalcount:0
    21 p_mut:64
    22 p_xov:16
    23 xov_mins:0
     24p_mut:64.0
     25p_xov:16.0
     26xov_mins:0.0
    2427selrule:2
    2528delrule:0
    26 cr_c:0
    27 cr_life:0
    28 cr_v:1
    29 cr_gl:0
    30 cr_joints:0
    31 cr_nnsiz:0
    32 cr_nncon:0
    33 cr_di:0
    34 cr_vpos:0
    35 cr_vvel:0
     29cr_c:0.0
     30cr_life:0.0
     31cr_v:1.0
     32cr_gl:0.0
     33cr_joints:0.0
     34cr_nnsiz:0.0
     35cr_nncon:0.0
     36cr_di:0.0
     37cr_vpos:0.0
     38cr_vvel:0.0
    3639cr_norm:0
    3740cr_simi:0
    38 Energy0:5000
    39 e_meta:1
     41Energy0:5000.0
     42e_meta:1.0
    4043feed:0
    41 feede0:200
     44feede0:200.0
    4245foodgen:
    43 feedtrans:1
     46feedtrans:1.0
    4447aging:0
    4548stagnation:0
    46 minfitness:0
     49minfitness:0.0
    4750boostphase:1
    4851makesound:0
     
    5053log:0
    5154notes:
    52 totaltestedcr:36
    53 totaltests:36
     55totaltestedcr:165
     56totaltests:165
    5457wrldtyp:0
    55 wrldsiz:20
     58wrldsiz:20.0
    5659wrldmap:
    57 wrldwat:-1
     60wrldwat:-1.0
    5861wrldbnd:0
    59 wrldg:1
     62wrldg:1.0
    6063simtype:0
    61 nnspeed:1
     64nnspeed:1.0
    6265odeshape:0
    6366odestep:0.05
    64 odemusclemin:0
    65 odemusclemax:10
    66 odemusclespeed:1
     67odemusclemin:0.0
     68odemusclemax:10.0
     69odemusclespeed:1.0
    6770odeairdrag:0.01
    6871odewaterdrag:0.5
    69 odewaterbuoy:1
     72odewaterbuoy:1.0
    7073odeseed:0
    7174odesepsticks:0
     
    7376odeworldcfm:1e-05
    7477odecolmumin:0.1
    75 odecolmumax:5
     78odecolmumax:5.0
    7679odecolbounce:0.1
    7780odecolbouncevel:0.01
    78 odecolsoftcfm:0
    79 odecolsofterp:0
     81odecolsoftcfm:0.0
     82odecolsofterp:0.0
    8083odecol2mumin:0.1
    81 odecol2mumax:1
     84odecol2mumax:1.0
    8285odecol2bounce:0.1
    8386odecol2bouncevel:0.01
    84 odecol2softcfm:0
    85 odecol2softerp:0
     87odecol2softcfm:0.0
     88odecol2softerp:0.0
    8689gen_hilite:1
    8790gen_extmutinfo:0
     
    123126f0_nodel_tag:1
    124127f0_nomod_tag:1
    125 f0_p_new:5
    126 f0_p_del:5
    127 f0_p_swp:10
    128 f0_p_pos:10
    129 f0_p_mas:10
    130 f0_p_frc:10
    131 f0_p_ing:10
    132 f0_p_asm:10
    133 f0_p_vsiz:0
    134 f0_j_new:5
    135 f0_j_del:5
    136 f0_j_stm:10
    137 f0_j_stf:10
    138 f0_j_rsf:10
    139 f0_j_vred:0
    140 f0_j_vgrn:0
    141 f0_j_vblu:0
    142 f0_n_new:5
    143 f0_n_del:5
    144 f0_n_prp:10
    145 f0_c_new:5
    146 f0_c_del:5
    147 f0_c_wei:10
     128f0_p_new:5.0
     129f0_p_del:5.0
     130f0_p_swp:10.0
     131f0_p_pos:10.0
     132f0_p_mas:10.0
     133f0_p_frc:10.0
     134f0_p_ing:10.0
     135f0_p_asm:10.0
     136f0_p_vsiz:0.0
     137f0_j_new:5.0
     138f0_j_del:5.0
     139f0_j_stm:10.0
     140f0_j_stf:10.0
     141f0_j_rsf:10.0
     142f0_j_vred:0.0
     143f0_j_vgrn:0.0
     144f0_j_vblu:0.0
     145f0_n_new:5.0
     146f0_n_del:5.0
     147f0_n_prp:10.0
     148f0_c_new:5.0
     149f0_c_del:5.0
     150f0_c_wei:10.0
    148151f1_xo_propor:0
    149152f1_smX:0.05
     
    155158f1_nmConn:0.1
    156159f1_nmProp:0.1
    157 f1_nmWei:1
     160f1_nmWei:1.0
    158161f1_nmVal:0.05
    159162f2_mutAddOper:0.4
     
    173176f3_xovGeneTransfer:0.8
    174177f3_xovCrossingOver:0.2
    175 f4_mut_add:50
    176 f4_mut_add_div:20
    177 f4_mut_add_conn:15
    178 f4_mut_add_neupar:5
    179 f4_mut_add_rep:10
    180 f4_mut_add_simp:50
    181 f4_mut_del:20
    182 f4_mut_mod:30
     178f4_mut_add:50.0
     179f4_mut_add_div:20.0
     180f4_mut_add_conn:15.0
     181f4_mut_add_neupar:5.0
     182f4_mut_add_rep:10.0
     183f4_mut_add_simp:50.0
     184f4_mut_del:20.0
     185f4_mut_mod:30.0
    183186genkonw0:1
    184187genkonw1:1
     
    187190genkonw4:1
    188191randinit:0.01
    189 nnoise:0
    190 touchrange:1
    191 bnoise_struct:0
    192 bnoise_vel:0
     192nnoise:0.0
     193touchrange:1.0
     194bnoise_struct:0.0
     195bnoise_vel:0.0
    193196ncl_N:1
    194197ncl_Nu:1
     
    222225ncl_SeeLight2:1
    223226simil_method:0
    224 simil_parts:0
    225 simil_partdeg:1
     227simil_parts:0.0
     228simil_partdeg:1.0
    226229simil_neuro:0.5
    227230symPosSteps:10
    228231symAlphaSteps:20
    229232symBetaSteps:20
    230 minjoint:0
    231 maxjoint:2
     233minjoint:0.0
     234maxjoint:2.0
    232235
    233236GenePool:
     
    235238fitness:return 0.0+this.velocity*1.0;
    236239fitfun:0
    237 fitm:2
    238 fitma:2
    239 
    240 org:
     240fitm:2.0
     241fitma:2.0
     242
     243Genotype:
    241244name:Uwuwit Si
    242245genotype:X
    243246info:
    244247num:1
    245 gnum:50
    246 popsiz:4
    247 lifespan:5000
    248 velocity:0
    249 distance:0
    250 vertvel:0
     248gnum:0
     249popsiz:6
     250lifespan:5000.0
     251velocity:0.0
     252distance:0.0
     253vertvel:0.0
    251254vertpos:-0.01
    252 user1:null
    253 user2:null
    254 user3:null
    255 uid:g6501
    256 
    257 org:
    258 name:Igoras Sy
    259 genotype:X[*]
    260 info:300.00% mutation of 'Uwuwit Si'
     255user1:@Serialized:null
     256user2:@Serialized:"2"
     257user3:@Serialized:null
     258uid:g1
     259
     260Genotype:
     261name:Ezupan Si
     262genotype:cX
     263info:100.00% mutation of 'Uwuwit Si'
    261264num:2
    262 gnum:51
    263 popsiz:3
    264 lifespan:5000
    265 velocity:0
    266 distance:0
    267 vertvel:0
     265gnum:1
     266popsiz:2
     267lifespan:5000.0
     268velocity:0.0
     269distance:0.0
     270vertvel:0.0
    268271vertpos:-0.01
    269 user1:null
    270 user2:null
    271 user3:null
    272 uid:g6502
    273 
    274 org:
    275 name:Emofuf Sy
    276 genotype:wX[*]
    277 info:25.00% mutation of 'Igoras Sy'
     272user1:@Serialized:null
     273user2:@Serialized:null
     274user3:@Serialized:null
     275uid:g2
     276
     277Genotype:
     278name:Omygut Sy
     279genotype:cX[@]
     280info:150.00% mutation of 'Ezupan Si'
    278281num:3
    279 gnum:52
    280 popsiz:3
    281 lifespan:5000
    282 velocity:0
    283 distance:0
    284 vertvel:0
     282gnum:2
     283popsiz:1
     284lifespan:5000.0
     285velocity:0.0
     286distance:0.0
     287vertvel:0.0
    285288vertpos:-0.01
    286 user1:null
    287 user2:null
    288 user3:null
    289 uid:g6503
     289user1:@Serialized:null
     290user2:@Serialized:null
     291user3:@Serialized:null
     292uid:g3
    290293
    291294Population:
     
    304307bodysim:1
    305308selfcol:0
    306 em_stat:0
    307 em_dyn:0
    308 en_assim:0
     309em_stat:0.0
     310em_dyn:0.0
     311en_assim:0.0
    309312
    310313Population:
     
    323326bodysim:1
    324327selfcol:0
    325 em_stat:0
    326 em_dyn:0
    327 en_assim:0
    328 
     328em_stat:0.0
     329em_dyn:0.0
     330en_assim:0.0
     331
Note: See TracChangeset for help on using the changeset viewer.