Changeset 90 for java/main/src/test


Ignore:
Timestamp:
07/02/13 16:20:07 (12 years ago)
Author:
psniegowski
Message:

HIGHLIGHTS:

CHANGELOG:
Make ProcedureParam? hold only ValueParams?.

Use id instead of names when naming gui components internally.

Basic procedure calling in GUI.

The actual procedure call is currently only backed
by the ObjectInstance?.

Add UnimplementedException?.

Improve naming of various gui elements.

Allow easy navigating in FEST Swing testing.

Add optional explicit order attribute to FramsClassAnnotation?.

That's because java reflection does return declared members
in any specific order. That ordering is needed only for
classes that have no representation in framsticks and need
a deterministic ordering of params.

Add ControlOwner? interface.

Add test for procedure calling in Browser.

First version of ParamAnnotation? for procedures.

Development of ProcedureParam?.

Add draft version of ProcedureParam? implementation in ReflectionAccess?.

Allow viewing FramsClasses? in gui Browser.

Extract ResourceBuilder? from ModelBuilder?.

Remove internalId from Param.

It was currently completely not utilised. Whether it is still needed
after introduction of ParamAnnotation? is arguable.

Add remaining param attributes to ParamAnnotation?.

Change AutoBuilder? semantics.

AutoBuilder? returns list of objects that are to be appended
with methods @AutoAppendAnnotation?.

This allows to omit explicit addition of ModelPackage? to instance
if the instance uses ModelBuilder? (registration of ModelPackage? comes
from schema).

Fix params ordering problem in auto created FramsClasses?.

Improve ObjectInstance?.

Several fixes to ModelBuilder?.

Improve test for ObjectInstance? in Browser.

Make initialization of robot static.

With robot recreated for second browser test, the test hanged
deep in AWT.

Add base convenience base test for Browser tests.

More tests to ObjectInstance?.

Rename Dispatcher.invokeLater() to dispatch().

Add assertDispatch.

It allows assertions in other threads, than TestNGInvoker.
Assertions are gathered after each method invocation and rethrown.

Use timeOut annotation attribute for tests involving some waiting.

Remove firstTask method (merge with joinableStart).

Clean up leftovers.

Remove unused FavouritesXMLFactory (the reading part is already
completely done with generic XmlLoader?, and writing part will be done
based on the same approach if needed).
Move UserFavourite? to the com.framsticks.gui.configuration package.

Remove GenotypeBrowser? as to specific.

This functionality will be available in ObjectInstance?.

Add interface ParamsPackage?.

Package containing registration of Java classes meant to use with
ReflectionAccess? may be in Instance using configuration.

Minor changes.

Make Group immutable.

Add AutoBuilder? interface extending Builder - only those would
be used to automatically build from XML.

Fix groups in FramsClass?.

Minor naming cleanup in Registry.

Add ModelComponent? interface.

All class creating the Model are implementing that interface.

Extract Model.build into ModelBuilder?.

ModelBuilder? will be compatible with other builders
and allow using it from configuration.

Fix NeuroConnection?.

Add synchronous get operation for dispatchers.

Rename JoinableMonitor? to Monitor.

Add ObjectInstance?.

This class is mainly for demonstration
and testing purposes.

Improve FramsServer? runner.

  • improve ExternalProcess? runner,
  • runner can kill the server but also react properly, when the server exists on it's own,
  • set default path to search for framsticks server installation,
  • add LoggingOutputListener?.
Location:
java/main/src/test
Files:
9 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • java/main/src/test/java/com/framsticks/gui/BrowserTest.java

    r88 r90  
    11package com.framsticks.gui;
    22
    3 import javax.swing.JFrame;
     3import static org.fest.assertions.Assertions.assertThat;
     4import static org.fest.swing.edt.GuiActionRunner.execute;
     5
    46
    57import org.apache.log4j.Logger;
    6 import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
    7 import org.fest.swing.edt.GuiActionRunner;
    8 import org.fest.swing.edt.GuiQuery;
    98import org.fest.swing.edt.GuiTask;
    10 import org.fest.swing.fixture.FrameFixture;
    11 import org.fest.swing.fixture.JTreeFixture;
    12 // import static org.fest.swing.edt.GuiActionRunner.*;
    13 import org.testng.annotations.*;
     9import org.testng.annotations.Test;
    1410
     11import com.framsticks.model.ModelPackage;
    1512import com.framsticks.remote.RemoteInstance;
    16 import com.framsticks.test.TestConfiguration;
    17 import com.framsticks.util.dispatching.Dispatching;
    18 import com.framsticks.util.dispatching.JoinableMonitor;
    19 // import com.framsticks.util.dispatching.Dispatching;
    2013
    21 import static org.fest.assertions.Assertions.*;
    22 import static org.fest.swing.core.BasicRobot.robotWithNewAwtHierarchy;
    23 import static org.fest.swing.edt.GuiActionRunner.*;
    24 import org.fest.swing.core.Robot;
     14public class BrowserTest extends BrowserBaseTest {
    2515
    26 public class BrowserTest extends TestConfiguration {
    2716        private static final Logger log = Logger.getLogger(BrowserTest.class);
    2817
    29         JoinableMonitor monitor;
    30         Browser browser;
    31         Robot robot;
    32         FrameFixture frame;
     18        RemoteInstance localhost;
    3319
    34         @BeforeClass
    35         public void setUp() {
    36                 FailOnThreadViolationRepaintManager.install();
    37                 assertThat(executeInEDT()).isTrue();
     20        @Override
     21        protected void configureBrowser() {
     22                browser = new Browser();
    3823
    39                 robot = robotWithNewAwtHierarchy();
    40 
    41                 browser = new Browser();
    42                 monitor = new JoinableMonitor(browser);
    43 
    44                 RemoteInstance localhost = new RemoteInstance();
     24                localhost = new RemoteInstance();
    4525                localhost.setName("localhost");
    4626                localhost.setAddress("localhost:9009");
     27                localhost.usePackage(new ModelPackage());
    4728
    4829                browser.addInstance(localhost);
    4930
    50                 monitor.use();
    51                 // robot.waitForIdle();
    52                 frame = new FrameFixture(robot,
    53                                 GuiActionRunner.execute(new GuiQuery<JFrame>() {
    54                                         @Override
    55                                         protected JFrame executeInEDT() throws Throwable {
    56                                                 return browser.getMainFrame().getSwing();
    57                                         }
    58                                 }));
    59 
    60                 log.info("frame fixture done");
    61                 // frame.show();
    62                 // log.info("frame fixture shown");
    6331        }
    6432
    65         public void clickAndExpandPath(JTreeFixture tree, String path) {
    66                 tree.clickPath(path).expandPath(path);
    67                 robot.waitForIdle();
    68         }
    69 
    70         @Test
     33        @Test(timeOut = 10000)
    7134        public void testShow() {
    7235                log.info("testing");
    73                 JTreeFixture tree = frame.tree("tree");
    7436                tree.clickRow(0).expandRow(0);
    7537                robot.waitForIdle();
    … …  
    8143                        @Override
    8244                        protected void executeInEDT() throws Throwable {
    83                                 assertThat(frame.panel("o Simulator").component().isVisible())
    84                                                 .isTrue();
     45                                assertThat(frame.panel("Simulator").component().isVisible()).isTrue();
    8546                        }
    8647                });
    8748
    88                 clickAndExpandPath(tree, "localhost/simulator/genepools");
    89                 clickAndExpandPath(tree, "localhost/simulator/genepools/groups");
    90                 clickAndExpandPath(tree, "localhost/simulator/genepools/groups/Genotypes");
     49                clickAndExpandPath("localhost/simulator/genepools");
     50                clickAndExpandPath("localhost/simulator/genepools/groups");
     51                clickAndExpandPath("localhost/simulator/genepools/groups/Genotypes");
     52        }
    9153
    9254
    9355
    94 
    95 
    96 
    97                 // tree.clickPath("localhost/simulator/genepools/groups/Genotypes/genotypes");
    98                 // robot.waitForIdle();
    99                 // sleep(2);
    100                 // tree.expandPath("localhost/simulator/genepools/groups/Genotypes/genotypes");
    101 
    102                 // tree.expandRow(tree.component().getLeadSelectionRow() + 1);
    103                 // robot.waitForIdle();
    104 
    105                 // sleep(2);
    106         }
    107 
    108 
    109         @AfterClass
    110         public void tearDown() {
    111                 log.info("before close");
    112 
    113                 monitor.drop();
    114 
    115                 Dispatching.joinAbsolutely(browser);
    116                 // frame.cleanUp();
    117                 // log.info("before close");
    118                 // browser.interrupt();
    119 
    120                 // try {
    121                 //      // frame.close();
    122                 // } catch (Throwable t) {
    123                 //      log.error("caught ", t);
    124                 // }
    125                 // log.info("after close");
    126                 // // frame.close();
    127                 // // frame.cleanUp();
    128 
    129 
    130 
    131                 // Dispatching.join(browser);
    132         }
    133 
    13456}

  • java/main/src/test/java/com/framsticks/model/f0/SchemaTest.java

    r88 r90  
    33import org.testng.annotations.*;
    44
     5import com.framsticks.params.FramsClass;
    56import com.framsticks.params.types.FloatParam;
    67import com.framsticks.test.TestConfiguration;
    … …  
    1516        @Test
    1617        public void loadSchemaWithXmlLoader() {
    17                 Schema schema = Schema.load(Schema.getDefaultDefinitionAsStream());
     18                Schema schema = new SchemaBuilder().stream(Schema.getDefaultDefinitionAsStream()).finish();
    1819                assertThat(schema.getFramsClasses().size()).isEqualTo(5);
    1920                assertThat(schema.getNeuroClasses().size()).isEqualTo(21);
    … …  
    2324                assertThat(schema.getNeuroClass("VEye").getParamEntry("p", FloatParam.class).getMax(Double.class)).isEqualTo(10.0, delta(0.0));
    2425
    25                 assertThat(schema.getFramsClass("p").getParamEntry("as", FloatParam.class).getDef(Double.class)).isEqualTo(0.25, delta(0.0));
     26                FramsClass partClass = schema.getFramsClass("p");
     27                assertThat(partClass).isNotNull();
     28                assertThat(partClass.getParamEntry("as", FloatParam.class).getDef(Double.class)).isEqualTo(0.25, delta(0.0));
     29                assertThat(partClass.getGroupCount()).isEqualTo(3);
     30                assertThat(partClass.getGroup(1).getName()).isEqualTo("Other properties");
     31                assertThat(partClass.getGroup(1).getCount()).isEqualTo(7);
     32                assertThat(partClass.getGroup(1).getParam(2)).isEqualTo(partClass.getParam("dn"));
    2633        }
    2734

  • java/main/src/test/java/com/framsticks/parsers/F0ParserTest.java

    r88 r90  
    44
    55import com.framsticks.model.*;
    6 import com.framsticks.model.Package;
    76import com.framsticks.model.f0.Schema;
     7import com.framsticks.model.f0.SchemaBuilder;
    88import com.framsticks.params.*;
    99import com.framsticks.params.types.FloatParam;
    … …  
    2525        private Schema schema;
    2626        private List<AccessInterface> accesses;
    27         private List<Object> objects;
     27        private List<ModelComponent> components;
    2828        private Model model;
    2929
    3030        @BeforeClass
    3131        public void setUp() throws Exception {
    32                 schema = Schema.load(Schema.getDefaultDefinitionAsStream());
    33                 Package.register(schema.getRegistry());
     32                schema = new SchemaBuilder().stream(Schema.getDefaultDefinitionAsStream()).finish();
    3433        }
    3534
    3635        @Test
     36        public void checkFramsClasses() {
     37                FramsClass modelClass = schema.getRegistry().getFramsClass("Model");
     38                assertThat(modelClass).isNotNull();
     39                assertThat(modelClass.getParam("se")).isInstanceOf(FloatParam.class);
     40                // assertThat(modelClass.getParam("energ0")).isInstanceOf(FloatParam.class);
     41                assertThat(modelClass.getParam("Vstyle")).isInstanceOf(StringParam.class);
     42                assertThat(modelClass.getParamCount()).isEqualTo(6);
     43                // assertThat();
     44
     45        }
     46
     47        @Test(dependsOnMethods = "checkFramsClasses")
    3748        public void primitiveParam() {
    3849                FramsClass joint = schema.getFramsClass("j");
    … …  
    4354                assertThat(dx.getMin(Double.class)).isEqualTo(-2.0, delta(0.0));
    4455
    45                 assertThat(schema.getRegistry().getInfoFromCache("n").getParamEntry("d", StringParam.class).getDef(String.class)).isEqualTo("N");
     56                assertThat(schema.getRegistry().getFramsClass("n").getParamEntry("d", StringParam.class).getDef(String.class)).isEqualTo("N");
    4657        }
    4758
    48         @Test
     59        @Test(dependsOnMethods = "primitiveParam")
    4960        public void readF0() throws IOException, ParseException {
    5061                assertThat(schema.getFramsClass("p")).isInstanceOf(FramsClass.class);
    51                 assertThat(schema.getRegistry().getInfoFromCache("p").getParamEntry("as", FloatParam.class).getDef(Double.class)).isEqualTo(0.25, delta(0.0));
     62                assertThat(schema.getRegistry().getFramsClass("p").getParamEntry("as", FloatParam.class).getDef(Double.class)).isEqualTo(0.25, delta(0.0));
    5263
    5364                accesses = new F0Parser(schema, F0ParserTest.class.getResourceAsStream("/parsers/f0_example.txt")).parse();
    5465
    55                 assertThat(accesses.size()).isEqualTo(12);
     66                assertThat(accesses.size()).isEqualTo(19);
    5667                assertThat(accesses.get(0).getSelected()).isInstanceOf(Model.class);
    5768                assertThat(accesses.get(5).get("i", String.class)).isEqualTo("1,2,3,\"dsadsa,,,,");
    … …  
    6273        @Test(dependsOnMethods = {"readF0"})
    6374        public void stripAccessInterface() {
    64                 objects = Util.stripAccessInterface(accesses);
     75                components = Util.stripAccessInterface(accesses, ModelComponent.class);
    6576
    66                 assertThat(objects.get(1)).isInstanceOf(Part.class);
    67                 assertThat(objects.get(4)).isInstanceOf(Joint.class);
    68                 assertThat(objects.get(6)).isInstanceOf(NeuroDef.class);
     77                assertThat(components.get(1)).isInstanceOf(Part.class);
     78                assertThat(components.get(4)).isInstanceOf(Joint.class);
     79                assertThat(components.get(6)).isInstanceOf(NeuroDefinition.class);
     80                assertThat(components.get(12)).isInstanceOf(NeuroConnection.class);
    6981        }
    7082
    7183        @Test(dependsOnMethods = {"stripAccessInterface"})
    7284        public void buildModel() {
    73                 model = Model.build(objects);
     85                model = new ModelBuilder().addComponents(components).finish();
    7486
    7587                assertThat(model.getParts().size()).isEqualTo(3);
    76                 assertThat(model.getNeuroDefs().size()).isEqualTo(6);
     88                assertThat(model.getNeuroDefinitions().size()).isEqualTo(6);
    7789                assertThat(model.getJoints().size()).isEqualTo(2);
    78 
    79                 assertThat(model.getJoints().get(0).part1).isEqualTo(0);
    80                 assertThat(model.getJoints().get(0).part2).isEqualTo(1);
    81                 assertThat(model.getNeuroDefs().size()).isEqualTo(6);
    82                 assertThat(model.getNeuroDefs().get(0).part).isEqualTo(1);
    83                 assertThat(model.getNeuroDefs().get(0).joint).isEqualTo(-1);
    84                 assertThat(model.getNeuroDefs().get(1).details).isEqualTo("|:p=0.25,r=1");
    85                 assertThat(model.getNeuroDefs().get(3).details).isEqualTo("N");
    86                 assertThat(model.getNeuroDefs().get(4).part).isEqualTo(-1);
     90                assertThat(model.getNeuroConnections().size()).isEqualTo(7);
    8791
    8892                assertThat(model.getParts().get(1).getPosition().x).isEqualTo(2.0, delta(0.0));
    8993                assertThat(model.getParts().get(2).getPosition().sub(new Point3d(2.27236, -0.0792596, -0.958924)).length()).isLessThan(0.0001);
    9094                assertThat(model.getParts().get(2).getOrientation().y.sub(new Point3d(0.870277, -0.404792, 0.280644)).length()).isLessThan(0.0001);
     95
     96                assertThat(model.getJoints().get(0).part1).isEqualTo(0);
     97                assertThat(model.getJoints().get(0).part2).isEqualTo(1);
     98
     99                assertThat(model.getNeuroDefinitions().get(0).part).isEqualTo(1);
     100                assertThat(model.getNeuroDefinitions().get(0).joint).isEqualTo(-1);
     101                assertThat(model.getNeuroDefinitions().get(1).details).isEqualTo("|:p=0.25,r=1");
     102                assertThat(model.getNeuroDefinitions().get(3).details).isEqualTo("N");
     103                assertThat(model.getNeuroDefinitions().get(4).part).isEqualTo(-1);
     104
     105                assertThat(model.getNeuroConnections().get(2).connectedNeuro).isEqualTo(0);
     106                assertThat(model.getNeuroConnections().get(5).weight).isEqualTo(5.6, delta(0.0));
     107
    91108        }
    92109
    … …  
    94111        public void print() throws Exception {
    95112                ListSink sink = new ListSink();
    96 
    97113
    98114                new F0Writer(schema, model, sink).write();
    … …  
    110126                        "n:j=0,d=@:p=0.25",
    111127                        "n:p=1,d=Nu",
     128                        "c:0,2",
     129                        "c:0,2,5.4",
     130                        "c:1,0",
     131                        "c:2,0,3.4",
     132                        "c:0,1,4.5",
     133                        "c:1,0,5.6",
     134                        "c:2,1",
    112135                        "m:"
    113136                );

  • java/main/src/test/java/com/framsticks/running/ExternalProcessTest.java

    r88 r90  
    1010
    1111import com.framsticks.test.TestConfiguration;
    12 import com.framsticks.util.dispatching.JoinableMonitor;
     12import com.framsticks.util.dispatching.Monitor;
    1313
    1414import static org.fest.assertions.Assertions.*;
    … …  
    1717public class ExternalProcessTest extends TestConfiguration {
    1818
    19         @Test
     19        @Test(timeOut = 1000)
    2020        public void runBash() throws InterruptedException {
    2121                final ExternalProcess process = new ExternalProcess();
    … …  
    3131                        }
    3232                });
    33                 JoinableMonitor monitor = new JoinableMonitor(process);
     33                Monitor monitor = new Monitor(process);
    3434                monitor.use();
    3535

  • java/main/src/test/java/com/framsticks/running/FramsServerTest.java

    r88 r90  
    44
    55import com.framsticks.core.Framsticks;
    6 import com.framsticks.remote.RemoteInstance;
    76import com.framsticks.test.TestConfiguration;
     7import com.framsticks.util.dispatching.Monitor;
    88
    99import static org.fest.assertions.Assertions.*;
    … …  
    1212public class FramsServerTest extends TestConfiguration {
    1313
    14         @Test
     14        @Test(timeOut = 3000)
    1515        public void runServer() {
    1616                Framsticks framsticks = Framsticks.loadConfiguration(FramsServerTest.class.getResourceAsStream("/configs/FramsServerTest.xml"));
    1717
    18                 assertThat(framsticks.getObservables().size()).isEqualTo(2);
     18                assertThat(framsticks.getObservables().size()).isEqualTo(1);
    1919                assertThat(framsticks.getObservables().get("frams")).isInstanceOf(FramsServer.class);
    20                 assertThat(framsticks.getObservables().get("remote")).isInstanceOf(RemoteInstance.class);
     20                // assertThat(framsticks.getObservables().get("remote")).isInstanceOf(RemoteInstance.class);
     21
     22                new Monitor(framsticks).use().useFor(1.0).drop().join();
     23
     24                // monitor.use();
     25
     26                // Dispatching.sleep(1000);
     27
     28                // // monitor.waitFor();
     29                // monitor.drop();
     30                // monitor.join();
    2131
    2232                // framsticks.start();

  • java/main/src/test/java/com/framsticks/test/TestConfiguration.java

    r88 r90  
    11package com.framsticks.test;
     2
     3import java.util.LinkedList;
     4import java.util.List;
    25
    36import org.apache.log4j.Logger;
    … …  
    58import org.testng.annotations.*;
    69
     10import com.framsticks.util.dispatching.Dispatcher;
     11import com.framsticks.util.dispatching.RunAt;
     12
    713public class TestConfiguration {
    814
    9         private static final Logger log =
    10                 Logger.getLogger(TestConfiguration.class);
     15        private static final Logger log = Logger.getLogger(TestConfiguration.class);
    1116
    1217        @BeforeClass
    … …  
    1621        }
    1722
     23        private final List<AsyncAssert<?>> asyncAssertions = new LinkedList<AsyncAssert<?>>();
     24
     25        public class AsyncAssert<C> extends RunAt<C> {
     26                final RunAt<? extends C> runnable;
     27                boolean done = false;
     28                AssertionError assertion;
     29
     30                /**
     31                 * @param runnable
     32                 */
     33                public AsyncAssert(RunAt<? extends C> runnable) {
     34                        this.runnable = runnable;
     35                }
     36
     37                @Override
     38                public void run() {
     39                        try {
     40                                runnable.run();
     41                        } catch (AssertionError e) {
     42                                assertion = e;
     43                        }
     44                        synchronized (this) {
     45                                done = true;
     46                                this.notifyAll();
     47                        }
     48                }
     49        }
     50
     51        public <C> void assertDispatch(Dispatcher<C> dispatcher, RunAt<? extends C> runnable) {
     52                AsyncAssert<C> assertion = new AsyncAssert<C>(runnable);
     53                synchronized (asyncAssertions) {
     54                        asyncAssertions.add(assertion);
     55                }
     56                dispatcher.dispatch(assertion);
     57        }
     58
     59        @BeforeMethod
     60        public void clearAsyncAsserts() {
     61                synchronized (asyncAssertions) {
     62                        asyncAssertions.clear();
     63                }
     64        }
     65
     66        @AfterMethod(timeOut = 5000)
     67        public void waitForAsyncAsserts() {
     68                while (true) {
     69                        AsyncAssert<?> assertion;
     70                        synchronized (asyncAssertions) {
     71                                if (asyncAssertions.isEmpty()) {
     72                                        return;
     73                                }
     74                                assertion = asyncAssertions.get(0);
     75                                asyncAssertions.remove(0);
     76                        }
     77                        synchronized (assertion) {
     78                                while (!assertion.done) {
     79                                        try {
     80                                                assertion.wait();
     81                                        } catch (InterruptedException ignored) {
     82                                        }
     83                                }
     84                                if (assertion.assertion != null) {
     85                                        throw assertion.assertion;
     86                                }
     87                        }
     88                }
     89        }
    1890}

  • java/main/src/test/resources/configs/FramsServerTest.xml

    r88 r90  
    33        <import class="com.framsticks.running.FramsServer" />
    44        <import class="com.framsticks.remote.RemoteInstance" />
    5         <FramsServer name="frams" port="9008" />
    6         <RemoteInstance name="remote" address="localhost:9008" />
     5        <import class="com.framsticks.running.LoggingOutputListener" />
     6        <FramsServer name="frams" port="9008">
     7                <LoggingOutputListener />
     8        </FramsServer>
     9        <!-- <RemoteInstance name="remote" address="localhost:9008" /> -->
    710</Framsticks>

  • java/main/src/test/resources/info/Part.info

    r86 r90  
    33
    44prop:
     5id:x
    56name:position.x
    6 id:x
    77type:f
    88flags:1024
    99
    1010prop:
     11id:y
    1112name:position.y
    12 id:y
    1313type:f
    1414flags:1024
    1515
    1616prop:
     17id:z
    1718name:position.z
    18 id:z
    1919type:f
    2020flags:1024
    2121
    2222prop:
     23id:m
    2324name:mass
    24 id:m
    25 type:f
    26 flags:0
     25type:f 0.1 999.0 1.0
    2726
    2827prop:
     28id:s
    2929name:size
    30 id:s
    31 type:f
    32 flags:0
     30type:f 0.1 10.0 1.0
    3331
    3432prop:
     33id:dn
    3534name:density
    36 id:dn
    37 type:f
    38 flags:0
     35type:f 0.2 5.0 1.0
    3936
    4037prop:
     38id:fr
    4139name:friction
    42 id:fr
    43 type:f
    44 flags:0
     40type:f 0.0 4.0 0.4
    4541
    4642prop:
     43id:ing
    4744name:ingestion
    48 id:ing
    49 type:f
    50 flags:0
     45type:f 0.0 1.0 0.25
    5146
    5247prop:
     48id:as
    5349name:assimilation
    54 id:as
    55 type:f
    56 flags:0
     50type:f 0.0 1.0 0.25
    5751
    5852prop:
     53id:rx
    5954name:rot.x
    60 id:rx
    6155type:f
    62 flags:0
    6356
    6457prop:
     58id:ry
    6559name:rot.y
    66 id:ry
    6760type:f
    6861flags:1024
    6962
    7063prop:
     64id:rz
    7165name:rot.z
    72 id:rz
    7366type:f
    7467flags:1024
    7568
    7669prop:
     70id:i
    7771name:info
    78 id:i
    7972type:s
    80 flags:0
    8173
    8274prop:
     75id:Vstyle
    8376name:vis_style
    84 id:Vstyle
    85 type:s
    86 flags:0
     77type:s 0 -1 part
    8778
    8879prop:
     80id:vs
    8981name:visual thickness
    90 id:vs
    91 type:f
    92 flags:0
     82type:f 0.05 0.7 0.3
    9383
    9484prop:
     85id:vr
    9586name:red component
    96 id:vr
    97 type:f
    98 flags:0
     87type:f 0.0 1.0 0.5
    9988
    10089prop:
     90id:vg
    10191name:green component
    102 id:vg
    103 type:f
     92type:f 0.0 1.0 0.5
    10493flags:1024
    10594
    10695prop:
     96id:vb
    10797name:blue component
    108 id:vb
    109 type:f
     98type:f 0.0 1.0 0.5
    11099flags:1024
    111100

  • java/main/src/test/resources/log4j.properties

    r88 r90  
    2727
    2828log4j.logger.com.framsticks=INFO
    29 # log4j.logger.com.framsticks.util.dispatching.JoinableMonitor=DEBUG
    30 # log4j.logger.com.framsticks.util.dispatching.Dispatching=DEBUG
     29# log4j.logger.com.framsticks.parsers.F0Writer=TRACE
     30# log4j.logger.com.framsticks.core.ObjectInstance=DEBUG
     31# log4j.logger.com.framsticks.core.Instance=DEBUG
     32# log4j.logger.com.framsticks.running=DEBUG
    3133# log4j.logger.com.framsticks.parsers.XmlLoader=DEBUG
    3234# log4j.logger.com.framsticks.parsers.MultiParamLoader=TRACE

  • java/main/src/test/resources/parsers/f0_example.txt

    r78 r90  
    1212n:j=0,d=@:p=0.25
    1313n:p=1,d=Nu
    14 #c:0,2
    15 #c:0,2,5.4
    16 #c:1,0
    17 #c:2,0,3.4
    18 #c:0,1,4.5
    19 #c:1,0,5.6
    20 #c:2,1
     14c:0,2
     15c:0,2,5.4
     16c:1,0
     17c:2,0,3.4
     18c:0,1,4.5
     19c:1,0,5.6
     20c:2,1
Note: See TracChangeset for help on using the changeset viewer.