Changeset 491 for java/Framclipse/com.framsticks.framclipse/res
- Timestamp:
- 03/30/16 23:16:03 (9 years ago)
- Location:
- java/Framclipse/com.framsticks.framclipse/res
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
java/Framclipse/com.framsticks.framclipse/res/framscontext.xml
r440 r491 13 13 <context name="Global context"/> 14 14 </code> 15 <properties from="prop " to="ExpParams"/>15 <properties from="property" to="ExpProperties"/> 16 16 <properties from="stat" to="ExpState"/> 17 17 </file> … … 25 25 <context name="Global context"/> 26 26 </code> 27 <properties from="prop " to="Fields"/>27 <properties from="property" to="NeuroProperties"/> 28 28 </file> 29 29 … … 36 36 <context name="Global context"/> 37 37 </code> 38 <properties from="prop " to="VisParams"/>38 <properties from="property" to="VisProperties"/> 39 39 </file> 40 40 … … 48 48 <context name="Global context"/> 49 49 </code> 50 <properties from="prop " to="ShowParams"/>50 <properties from="property" to="ShowProperties"/> 51 51 </file> 52 52 -
java/Framclipse/com.framsticks.framclipse/res/framscript.xml
r469 r491 123 123 <description><![CDATA[Deprecated. Use population instead.]]></description> 124 124 </element> 125 <element name="population" type=" untyped" flags="35"/>125 <element name="population" type="Population" flags="35"/> 126 126 <element name="index" type="integer" flags="35"> 127 127 <description><![CDATA[Note that the index changes depending on the current creature position in the population. Use Creature.uid if you need a permanent identifier that persists through the entire object lifetime.]]></description> … … 190 190 <element name="numjoints" type="integer" flags="3"/> 191 191 <element name="numneurons" type="integer" flags="3"/> 192 <element name="user1" type="untyped"/> 193 <element name="user2" type="untyped"/> 194 <element name="user3" type="untyped"/> 192 <element name="data" type="Dictionary" flags="32768"/> 193 <element name="user1" type="untyped" deprecated="true" flags="8192"/> 194 <element name="user2" type="untyped" deprecated="true" flags="8192"/> 195 <element name="user3" type="untyped" deprecated="true" flags="8192"/> 195 196 <element name="move" function="true" type="void" flags="32"> 196 197 <description><![CDATA[Shift the creature by a given vector.]]></description> … … 442 443 <description><![CDATA[Center of gravity]]></description> 443 444 </element> 444 <element name="user1" type="untyped"/> 445 <element name="user2" type="untyped"/> 446 <element name="user3" type="untyped"/> 445 <element name="data" type="Dictionary" flags="32768"/> 446 <element name="user1" type="untyped" deprecated="true" flags="8192"/> 447 <element name="user2" type="untyped" deprecated="true" flags="8192"/> 448 <element name="user3" type="untyped" deprecated="true" flags="8192"/> 447 449 <element name="orient" type="Orient" flags="32"> 448 450 <description><![CDATA[By convention, the orientation of the creature is equal to the orientation of its first Part]]></description> … … 513 515 <description><![CDATA[The resulting clone is a shallow copy (contains the same object references as the original). A deep copy can be obtained through serialization: String.deserialize(String.serialize(object));]]></description> 514 516 <arguments/></element> 517 <element name="assign" function="true" type="void" flags="256"> 518 <description><![CDATA[Replaces current dictionary with dictionary contents from another object.]]></description> 519 <arguments> 520 <argument type="untyped"/> 521 </arguments> 522 </element> 515 523 </type> 516 524 <type name="File" context="Global context"> … … 630 638 <arguments/></element> 631 639 <element name="pathseparator" type="string" flags="33"/> 640 <element name="callURL" function="true" type="Dictionary" flags="32"> 641 <arguments> 642 <argument name="url" type="string"/> 643 <argument name="post data or null" type="untyped"/> 644 <argument name="callback or null" type="FunctionReference"/> 645 </arguments> 646 </element> 632 647 </type> 633 648 <type name="FunctionReference" context="Global context"> … … 720 735 </element> 721 736 <element name="add" function="true" type="Genotype" flags="34"> 722 <description><![CDATA[Creates a new Genotype from the supplied Geno type, Genoor string.737 <description><![CDATA[Creates a new Genotype from the supplied Geno or string. 723 738 Returns the created Genotype.]]></description> 724 739 <arguments> 725 <argument name="geno type object or genoobject or string genotype" type="untyped"/>740 <argument name="geno object or string genotype" type="untyped"/> 726 741 </arguments> 727 742 </element> … … 1357 1372 <element name="f1_smComma" type="float" min="0" max="100" default="0.02"/> 1358 1373 <element name="f1_smModif" type="float" min="0" max="100" default="0.1"> 1359 <description><![CDATA[Modifiers: LlRrCcQqFfMmIi WwEeAaSsDdGgBbHh]]></description>1374 <description><![CDATA[Modifiers: LlRrCcQqFfMmIiEeWwAaSsDdGgBbHh]]></description> 1360 1375 </element> 1361 1376 <element name="f1_mut_exmod" type="string" max="30"> 1362 1377 <description><![CDATA[Modifiers that will not be added nor deleted during mutation 1363 (all: LlRrCcQqFfMmIi WwEeAaSsDdGgBbHh)]]></description>1378 (all: LlRrCcQqFfMmIiEeWwAaSsDdGgBbHh)]]></description> 1364 1379 </element> 1365 1380 <element name="f1_nmNeu" type="float" min="0" max="100" default="0.05"> … … 1598 1613 </element> 1599 1614 <element name="convtrace1" type="string" flags="3"/> 1600 <element name="user1" type="untyped"/> 1601 <element name="user2" type="untyped"/> 1602 <element name="user3" type="untyped"/> 1615 <element name="data" type="Dictionary" flags="32768"/> 1616 <element name="user1" type="untyped" deprecated="true" flags="8192"/> 1617 <element name="user2" type="untyped" deprecated="true" flags="8192"/> 1618 <element name="user3" type="untyped" deprecated="true" flags="8192"/> 1603 1619 <element name="mutate" function="true" type="void"><arguments/></element> 1604 1620 <element name="isValid" type="integer" min="0" max="1" deprecated="true" flags="8227"> … … 1650 1666 </arguments> 1651 1667 </element> 1652 <element name="copyTo" function="true" type="Genotype" flags="32"> 1653 <description><![CDATA[returns the duplicate genotype, created in the target pool]]></description> 1654 <arguments> 1655 <argument name="pool" type="GenePool"/> 1656 </arguments> 1657 </element> 1668 <element name="clone" function="true" type="Genotype" flags="32"> 1669 <description><![CDATA[Returns a duplicated genotype, not attached to any gene pool. All genotype fields are copied including 'data' (for which Dictionary.clone() produces a shallow copy).]]></description> 1670 <arguments/></element> 1658 1671 <element name="delete" function="true" type="void" flags="32"><arguments/></element> 1659 1672 <element name="deleteOne" function="true" type="void" flags="32"> 1660 1673 <description><![CDATA[]]></description> 1661 1674 <arguments/></element> 1662 <element name="genepool" type=" untyped" flags="35">1675 <element name="genepool" type="GenePool" flags="35"> 1663 1676 <description><![CDATA[GenePool object or null when not in pool]]></description> 1664 1677 </element> … … 1672 1685 <type name="Interface" context="Global context"> 1673 1686 <description><![CDATA[Used to query for object member descriptions. Example: 1674 var iface=Interface.makeFrom(someobject); var description="this object has "+iface. properties+" properties, first property is "+iface.getId(0);]]></description>1687 var iface=Interface.makeFrom(someobject); var description="this object has "+iface.size+" properties, first property is "+iface.getId(0);]]></description> 1675 1688 <element name="name" type="string" flags="257"/> 1676 <element name=" properties" type="integer" flags="257"/>1689 <element name="size" type="integer" flags="257"/> 1677 1690 <element name="groups" type="integer" flags="257"/> 1678 1691 <element name="get" function="true" type="untyped" flags="256"> … … 2210 2223 <element name="part" type="MechPart" flags="1"/> 2211 2224 <element name="joint" type="MechJoint" flags="1"/> 2212 <element name=" fields" type="Fields" flags="1">2213 <description><![CDATA[Neurons can have different fields depending on their class. Script neurons have their fields defined using the "prop :" syntax. If you develop a custom neuron script you should use the Fields object for accessing your own neuron fields. The Neuro.fields property is meant for accessing the neuron fields from the outside script.2225 <element name="neuroproperties" type="NeuroProperties" flags="1"> 2226 <description><![CDATA[Neurons can have different fields depending on their class. Script neurons have their fields defined using the "property:" syntax. If you develop a custom neuron script you should use the NeuroProperties object for accessing your own neuron fields. The Neuro.neuroproperties property is meant for accessing the neuron fields from the outside script. 2214 2227 Examples: 2215 2228 var c=Populations.createFromString("X[N]"); 2216 Simulator.print("standard neuron inertia="+c.getNeuro(0). fields.in);2229 Simulator.print("standard neuron inertia="+c.getNeuro(0).neuroproperties.in); 2217 2230 c=Populations.createFromString("X[Nn,e:0.1]"); 2218 Simulator.print("noisy neuron error rate="+c.getNeuro(0). fields.e);2231 Simulator.print("noisy neuron error rate="+c.getNeuro(0).neuroproperties.e); 2219 2232 2220 2233 The Interface object can be used to discover which fields are available for a certain neuron object: 2221 2234 c=Populations.createFromString("X[N]"); 2222 var iobj=Interface.makeFrom(c.getNeuro(0). fields);2235 var iobj=Interface.makeFrom(c.getNeuro(0).neuroproperties); 2223 2236 var i; 2224 for(i=0;i<iobj. properties;i++)2237 for(i=0;i<iobj.size;i++) 2225 2238 Simulator.print(iobj.getId(i)+" ("+iobj.getName(i)+")");]]></description> 2226 2239 </element> … … 2634 2647 </element> 2635 2648 <element name="odeairdrag" type="float" min="0" max="0.5" default="0.01"> 2636 <description><![CDATA[A drag force ("air drag") proportional to the velocity of mass centers of moving parts]]></description> 2649 <description><![CDATA[A drag force ("air drag") proportional to the velocity of mass centers of moving parts (ODE's "linear damping")]]></description> 2650 </element> 2651 <element name="oderotdrag" type="float" min="0" max="0.5" default="0.01"> 2652 <description><![CDATA[Drag momentum acting on rotating bodies (ODE's "angular damping")]]></description> 2637 2653 </element> 2638 2654 <element name="odewaterdrag" type="float" min="0.001" max="1" default="0.5"/> … … 3239 3255 </element> 3240 3256 <element name="eval" function="true" type="void" flags="32"> 3241 <description><![CDATA[The argument must be a complete statement, e.g. "return 2+2;" is valid, while "2+2" is not. The E valError object is returned for invalid statements.3257 <description><![CDATA[The argument must be a complete statement, e.g. "return 2+2;" is valid, while "2+2" is not. The Error object is returned for invalid statements. 3242 3258 Example: 3243 3259 var statement="function fun(a) {return a*a;} return fun(Math.pi);"; 3244 3260 var result=Simulator.eval(statement); 3245 if (typeof result=="E valError")3261 if (typeof result=="Error") 3246 3262 Simulator.print("Error:"+result.message); 3247 3263 else … … 3384 3400 <element name="populations" type="Populations" flags="35"/> 3385 3401 <element name="genepools" type="GenePools" flags="35"/> 3386 <element name="expp arams" type="ExpParams" flags="35"/>3402 <element name="expproperties" type="ExpProperties" flags="35"/> 3387 3403 <element name="expstate" type="ExpState" flags="35"/> 3388 3404 <element name="genman" type="GenMan" flags="35"/> … … 3451 3467 </element> 3452 3468 <element name="odeairdrag" type="float" min="0" max="0.5" default="0.01"> 3453 <description><![CDATA[A drag force ("air drag") proportional to the velocity of mass centers of moving parts]]></description> 3469 <description><![CDATA[A drag force ("air drag") proportional to the velocity of mass centers of moving parts (ODE's "linear damping")]]></description> 3470 </element> 3471 <element name="oderotdrag" type="float" min="0" max="0.5" default="0.01"> 3472 <description><![CDATA[Drag momentum acting on rotating bodies (ODE's "angular damping")]]></description> 3454 3473 </element> 3455 3474 <element name="odewaterdrag" type="float" min="0.001" max="1" default="0.5"/> … … 3909 3928 <element name="f1_smComma" type="float" min="0" max="100" default="0.02"/> 3910 3929 <element name="f1_smModif" type="float" min="0" max="100" default="0.1"> 3911 <description><![CDATA[Modifiers: LlRrCcQqFfMmIi WwEeAaSsDdGgBbHh]]></description>3930 <description><![CDATA[Modifiers: LlRrCcQqFfMmIiEeWwAaSsDdGgBbHh]]></description> 3912 3931 </element> 3913 3932 <element name="f1_mut_exmod" type="string" max="30"> 3914 3933 <description><![CDATA[Modifiers that will not be added nor deleted during mutation 3915 (all: LlRrCcQqFfMmIi WwEeAaSsDdGgBbHh)]]></description>3934 (all: LlRrCcQqFfMmIiEeWwAaSsDdGgBbHh)]]></description> 3916 3935 </element> 3917 3936 <element name="f1_nmNeu" type="float" min="0" max="100" default="0.05"> … … 4396 4415 </element> 4397 4416 <element name="eval" function="true" type="void" flags="32"> 4398 <description><![CDATA[The argument must be a complete statement, e.g. "return 2+2;" is valid, while "2+2" is not. The E valError object is returned for invalid statements.4417 <description><![CDATA[The argument must be a complete statement, e.g. "return 2+2;" is valid, while "2+2" is not. The Error object is returned for invalid statements. 4399 4418 Example: 4400 4419 var statement="function fun(a) {return a*a;} return fun(Math.pi);"; 4401 4420 var result=Simulator.eval(statement); 4402 if (typeof result=="E valError")4421 if (typeof result=="Error") 4403 4422 Simulator.print("Error:"+result.message); 4404 4423 else … … 4541 4560 <element name="populations" type="Populations" flags="35"/> 4542 4561 <element name="genepools" type="GenePools" flags="35"/> 4543 <element name="expp arams" type="ExpParams" flags="35"/>4562 <element name="expproperties" type="ExpProperties" flags="35"/> 4544 4563 <element name="expstate" type="ExpState" flags="35"/> 4545 4564 <element name="genman" type="GenMan" flags="35"/> … … 4913 4932 </element> 4914 4933 <element name="deserialize" function="true" type="untyped"> 4915 <description><![CDATA[Extracts objects from textual representation.]]></description> 4934 <description><![CDATA[Extracts objects from textual representation. Error object is returned if deserialization fails. 4935 Example: 4936 var ret=String.deserialize(something); 4937 if (typeof(ret)=="Error") Simulator.print("something is wrong: "+ret.message);]]></description> 4916 4938 <arguments> 4917 4939 <argument type="string"/> … … 5227 5249 </element> 5228 5250 </type> 5229 <type name="ExpP arams" context="Experiment definition">5251 <type name="ExpProperties" context="Experiment definition"> 5230 5252 <element name="clear" function="true" flags="34"/> 5231 5253 <element name="add" function="true" flags="34"/> … … 5355 5377 <element name="part" type="MechPart" flags="1"/> 5356 5378 <element name="joint" type="MechJoint" flags="1"/> 5357 <element name=" fields" type="Fields" flags="1">5358 <description><![CDATA[Neurons can have different fields depending on their class. Script neurons have their fields defined using the "prop :" syntax. If you develop a custom neuron script you should use the Fields object for accessing your own neuron fields. The Neuro.fields property is meant for accessing the neuron fields from the outside script.5379 <element name="neuroproperties" type="NeuroProperties" flags="1"> 5380 <description><![CDATA[Neurons can have different fields depending on their class. Script neurons have their fields defined using the "property:" syntax. If you develop a custom neuron script you should use the NeuroProperties object for accessing your own neuron fields. The Neuro.neuroproperties property is meant for accessing the neuron fields from the outside script. 5359 5381 Examples: 5360 5382 var c=Populations.createFromString("X[N]"); 5361 Simulator.print("standard neuron inertia="+c.getNeuro(0). fields.in);5383 Simulator.print("standard neuron inertia="+c.getNeuro(0).neuroproperties.in); 5362 5384 c=Populations.createFromString("X[Nn,e:0.1]"); 5363 Simulator.print("noisy neuron error rate="+c.getNeuro(0). fields.e);5385 Simulator.print("noisy neuron error rate="+c.getNeuro(0).neuroproperties.e); 5364 5386 5365 5387 The Interface object can be used to discover which fields are available for a certain neuron object: 5366 5388 c=Populations.createFromString("X[N]"); 5367 var iobj=Interface.makeFrom(c.getNeuro(0). fields);5389 var iobj=Interface.makeFrom(c.getNeuro(0).neuroproperties); 5368 5390 var i; 5369 for(i=0;i<iobj. properties;i++)5391 for(i=0;i<iobj.size;i++) 5370 5392 Simulator.print(iobj.getId(i)+" ("+iobj.getName(i)+")");]]></description> 5371 5393 </element> … … 5424 5446 </element> 5425 5447 <element name="convtrace1" type="string" flags="3"/> 5426 <element name="user1" type="untyped"/> 5427 <element name="user2" type="untyped"/> 5428 <element name="user3" type="untyped"/> 5448 <element name="data" type="Dictionary" flags="32768"/> 5449 <element name="user1" type="untyped" deprecated="true" flags="8192"/> 5450 <element name="user2" type="untyped" deprecated="true" flags="8192"/> 5451 <element name="user3" type="untyped" deprecated="true" flags="8192"/> 5429 5452 <element name="mutate" function="true" type="void"><arguments/></element> 5430 5453 <element name="isValid" type="integer" min="0" max="1" deprecated="true" flags="8227"> … … 5476 5499 </arguments> 5477 5500 </element> 5478 <element name="copyTo" function="true" type="Genotype" flags="32"> 5479 <description><![CDATA[returns the duplicate genotype, created in the target pool]]></description> 5480 <arguments> 5481 <argument name="pool" type="GenePool"/> 5482 </arguments> 5483 </element> 5501 <element name="clone" function="true" type="Genotype" flags="32"> 5502 <description><![CDATA[Returns a duplicated genotype, not attached to any gene pool. All genotype fields are copied including 'data' (for which Dictionary.clone() produces a shallow copy).]]></description> 5503 <arguments/></element> 5484 5504 <element name="delete" function="true" type="void" flags="32"><arguments/></element> 5485 5505 <element name="deleteOne" function="true" type="void" flags="32"> 5486 5506 <description><![CDATA[]]></description> 5487 5507 <arguments/></element> 5488 <element name="genepool" type=" untyped" flags="35">5508 <element name="genepool" type="GenePool" flags="35"> 5489 5509 <description><![CDATA[GenePool object or null when not in pool]]></description> 5490 5510 </element> … … 5509 5529 <description><![CDATA[Deprecated. Use population instead.]]></description> 5510 5530 </element> 5511 <element name="population" type=" untyped" flags="35"/>5531 <element name="population" type="Population" flags="35"/> 5512 5532 <element name="index" type="integer" flags="35"> 5513 5533 <description><![CDATA[Note that the index changes depending on the current creature position in the population. Use Creature.uid if you need a permanent identifier that persists through the entire object lifetime.]]></description> … … 5576 5596 <element name="numjoints" type="integer" flags="3"/> 5577 5597 <element name="numneurons" type="integer" flags="3"/> 5578 <element name="user1" type="untyped"/> 5579 <element name="user2" type="untyped"/> 5580 <element name="user3" type="untyped"/> 5598 <element name="data" type="Dictionary" flags="32768"/> 5599 <element name="user1" type="untyped" deprecated="true" flags="8192"/> 5600 <element name="user2" type="untyped" deprecated="true" flags="8192"/> 5601 <element name="user3" type="untyped" deprecated="true" flags="8192"/> 5581 5602 <element name="move" function="true" type="void" flags="32"> 5582 5603 <description><![CDATA[Shift the creature by a given vector.]]></description> … … 6025 6046 <element name="twosided" type="integer" min="0" max="1"/> 6026 6047 </type> 6027 <type name="VisP arams" context="Visual style definition">6048 <type name="VisProperties" context="Visual style definition"> 6028 6049 <element name="clear" function="true" flags="34"/> 6029 6050 <element name="add" function="true" flags="34"/> … … 7020 7041 <element name="changedPropertyId" type="string" flags="35"/> 7021 7042 </type> 7022 <type name="ShowP arams" context="Framsticks Theater">7043 <type name="ShowProperties" context="Framsticks Theater"> 7023 7044 <element name="clear" function="true" flags="34"/> 7024 7045 <element name="add" function="true" flags="34"/>
Note: See TracChangeset
for help on using the changeset viewer.