From 30fbd682ee30ee6497a87c6ad1377131b1aada40 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 18 Feb 2016 10:21:12 -0600 Subject: [PATCH] Functions with enumerated default arguments cause bad python code to be generated Found a lot more data recording groups that have the same problem. refs #176 --- trick_sims/SIM_ball_L2/Modified_data/data_record.dr | 2 ++ trick_sims/SIM_ball_L3/Modified_data/data_record.dr | 2 ++ trick_sims/SIM_cannon_eulercromer/Modified_data/cannon.dr | 1 + trick_sims/SIM_test_dr/Modified_data/dr_bitfASCII.dr | 1 + trick_sims/SIM_test_dr/Modified_data/dr_bitfBINARY.dr | 1 + trick_sims/SIM_test_dr/Modified_data/dr_typesASCII.dr | 1 + trick_sims/SIM_test_dr/Modified_data/dr_typesBINARY.dr | 1 + trick_source/sim_services/Clock/test/.gitignore | 1 + 8 files changed, 10 insertions(+) diff --git a/trick_sims/SIM_ball_L2/Modified_data/data_record.dr b/trick_sims/SIM_ball_L2/Modified_data/data_record.dr index f44eed60..0ac8c330 100644 --- a/trick_sims/SIM_ball_L2/Modified_data/data_record.dr +++ b/trick_sims/SIM_ball_L2/Modified_data/data_record.dr @@ -32,6 +32,7 @@ def add_dr_group(): drg[DR_GROUP_ID].add_variable("ball.state.output.external_force[0]", "ball.state.out.external_force[0]") drg[DR_GROUP_ID].add_variable("ball.state.output.external_force[1]", "ball.state.out.external_force[1]") + drg[DR_GROUP_ID].thisown = 0 trick_data_record.drd.add_group( drg[DR_GROUP_ID], trick.DR_Buffer ) add_dr_group() @@ -60,6 +61,7 @@ def add_dr_group(): drg[DR_GROUP_ID].add_variable("ball.altimeter.output.altitude") + drg[DR_GROUP_ID].thisown = 0 trick_data_record.drd.add_group( drg[DR_GROUP_ID], trick.DR_Buffer ) add_dr_group() diff --git a/trick_sims/SIM_ball_L3/Modified_data/data_record.dr b/trick_sims/SIM_ball_L3/Modified_data/data_record.dr index aabe9195..7b9a7ec0 100644 --- a/trick_sims/SIM_ball_L3/Modified_data/data_record.dr +++ b/trick_sims/SIM_ball_L3/Modified_data/data_record.dr @@ -40,6 +40,7 @@ def add_dr_group(): drg[DR_GROUP_ID].add_variable("ball2.state.output.external_force[0]") drg[DR_GROUP_ID].add_variable("ball2.state.output.external_force[1]") + drg[DR_GROUP_ID].thisown = 0 trick_data_record.drd.add_group( drg[DR_GROUP_ID], trick.DR_Buffer ) add_dr_group() @@ -69,6 +70,7 @@ def add_dr_group(): drg[DR_GROUP_ID].add_variable("ball.altimeter.output.altitude") drg[DR_GROUP_ID].add_variable("ball2.altimeter.output.altitude") + drg[DR_GROUP_ID].thisown = 0 trick_data_record.drd.add_group( drg[DR_GROUP_ID], trick.DR_Buffer ) add_dr_group() diff --git a/trick_sims/SIM_cannon_eulercromer/Modified_data/cannon.dr b/trick_sims/SIM_cannon_eulercromer/Modified_data/cannon.dr index e509b0c4..5a96c599 100644 --- a/trick_sims/SIM_cannon_eulercromer/Modified_data/cannon.dr +++ b/trick_sims/SIM_cannon_eulercromer/Modified_data/cannon.dr @@ -17,5 +17,6 @@ drg[DR_GROUP_ID].add_variable("dyn.cannon.vel[0]") drg[DR_GROUP_ID].add_variable("dyn.cannon.vel[1]") drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[0]") drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[1]") +drg[DR_GROUP_ID].thisown = 0 trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer) drg[DR_GROUP_ID].enable() diff --git a/trick_sims/SIM_test_dr/Modified_data/dr_bitfASCII.dr b/trick_sims/SIM_test_dr/Modified_data/dr_bitfASCII.dr index 42436b3b..3113dc88 100644 --- a/trick_sims/SIM_test_dr/Modified_data/dr_bitfASCII.dr +++ b/trick_sims/SIM_test_dr/Modified_data/dr_bitfASCII.dr @@ -39,5 +39,6 @@ drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var1") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var2") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var3") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var4") +drg[DR_GROUP_ID].thisown = 0 trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer) drg[DR_GROUP_ID].enable() diff --git a/trick_sims/SIM_test_dr/Modified_data/dr_bitfBINARY.dr b/trick_sims/SIM_test_dr/Modified_data/dr_bitfBINARY.dr index 8a683cdb..be2334fb 100644 --- a/trick_sims/SIM_test_dr/Modified_data/dr_bitfBINARY.dr +++ b/trick_sims/SIM_test_dr/Modified_data/dr_bitfBINARY.dr @@ -39,5 +39,6 @@ drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var1") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var2") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var3") drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var4") +drg[DR_GROUP_ID].thisown = 0 trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer) drg[DR_GROUP_ID].enable() diff --git a/trick_sims/SIM_test_dr/Modified_data/dr_typesASCII.dr b/trick_sims/SIM_test_dr/Modified_data/dr_typesASCII.dr index 7d290b62..92af7f35 100644 --- a/trick_sims/SIM_test_dr/Modified_data/dr_typesASCII.dr +++ b/trick_sims/SIM_test_dr/Modified_data/dr_typesASCII.dr @@ -25,5 +25,6 @@ drg[DR_GROUP_ID].add_variable("drx.drt.k") drg[DR_GROUP_ID].add_variable("drx.drt.l") drg[DR_GROUP_ID].add_variable("drx.drt.m") drg[DR_GROUP_ID].add_variable("drx.drt.n") +drg[DR_GROUP_ID].thisown = 0 trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer) drg[DR_GROUP_ID].enable() diff --git a/trick_sims/SIM_test_dr/Modified_data/dr_typesBINARY.dr b/trick_sims/SIM_test_dr/Modified_data/dr_typesBINARY.dr index 2afbec4e..462c78b5 100644 --- a/trick_sims/SIM_test_dr/Modified_data/dr_typesBINARY.dr +++ b/trick_sims/SIM_test_dr/Modified_data/dr_typesBINARY.dr @@ -25,5 +25,6 @@ drg[DR_GROUP_ID].add_variable("drx.drt.k") drg[DR_GROUP_ID].add_variable("drx.drt.l") drg[DR_GROUP_ID].add_variable("drx.drt.m") drg[DR_GROUP_ID].add_variable("drx.drt.n") +drg[DR_GROUP_ID].thisown = 0 trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer) drg[DR_GROUP_ID].enable() diff --git a/trick_source/sim_services/Clock/test/.gitignore b/trick_source/sim_services/Clock/test/.gitignore index 8ed8bd85..7aadd580 100644 --- a/trick_source/sim_services/Clock/test/.gitignore +++ b/trick_source/sim_services/Clock/test/.gitignore @@ -1,3 +1,4 @@ *.o BC635Clock_test TPROCTEClock_test +GetTimeOfDayClock_test