[Jsbsim-devel] Switches and Conditions

[Jon S. B. <jon...@co...>]

I've fixed a few items having to do with the Switch control system component
and the nested condition logic that is also used in scripts.

First, I discovered that nested tests that included single-line tests did
not work properly. For instance, this XML code was problematic:

    <test value="3" logic="OR">
      simulation/input1 eq 8
      simulation/input2 gt 9
      <test logic="OR">
        simulation/input1 eq 10
        simulation/input2 gt 11
      </test>
    </test>

This alternate code does appear to work:

    <test value="3" logic="OR">
      <test logic="OR">
        simulation/input1 eq 8   <!-- These two lines must be surrounded -->
        simulation/input2 gt 9   <!-- in a <test> element                -->
      </test>
      <test logic="OR">
        simulation/input1 eq 10
        simulation/input2 gt 11
      </test>
    </test>

I believe the problem lies with the Expat XML parser code, but am not sure.

Additionally, I fixed the Debug code that echoes out the conditions after
they are read in.

These changes probably won't affect most people, since most or all of the
tests I have seen used are not nested, but simple tests. Nevertheless, you
should check your code and make sure that things are working as you expect.

Thanks,

Jon