Skip to content

Commit

Permalink
Attempt to merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacito12 committed Jul 31, 2024
1 parent 0afb0e9 commit 355f328
Show file tree
Hide file tree
Showing 476 changed files with 15,699 additions and 2,693 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6,332 changes: 6,332 additions & 0 deletions BEV/BEV_system_model.mdl.r2023b

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions BEV/Test/TestResults_R2023b.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="BEV_UnitTest_MQC" skipped="0" tests="15" time="126.2736">
<testcase classname="BEV_UnitTest_MQC" name="MQC_CallbackButtons_1" time="5.4622"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_TopFolder_1" time="10.9343"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_TopFolder_2" time="0.24489"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_TopFolder_3" time="13.7184"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_1_1" time="9.066"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_1_2" time="17.2894"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_1_3" time="9.8453"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_1_4" time="8.6392"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_1_5" time="13.9652"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_2_1" time="10.7863"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_SimulationCases_2_2" time="9.9055"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_Configuration_1" time="1.0008"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_Configuration_2" time="1.5406"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_Utility_1" time="0.0046718"/>
<testcase classname="BEV_UnitTest_MQC" name="MQC_Utility_2" time="13.8711"/>
</testsuite>
</testsuites>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="BEVController_UnitTest_MQC" skipped="0" tests="4" time="5.3842">
<testcase classname="BEVController_UnitTest_MQC" name="MQC_Harness_1" time="3.0856"/>
<testcase classname="BEVController_UnitTest_MQC" name="MQC_Harness_2" time="0.0092191"/>
<testcase classname="BEVController_UnitTest_MQC" name="MQC_SimulationCase_1" time="2.2818"/>
<testcase classname="BEVController_UnitTest_MQC" name="MQC_TopFolder_1" time="0.0075813"/>
</testsuite>
</testsuites>
3,575 changes: 3,575 additions & 0 deletions Components/BatteryHighVoltage/Harness/BatteryHV_harness_model.mdl.r2023b

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="BatteryHV_UnitTest" skipped="0" tests="3" time="2.2272">
<testcase classname="BatteryHV_UnitTest" name="blockParameters_BatteryHV_Basic" time="1.0259"/>
<testcase classname="BatteryHV_UnitTest" name="blockParameters_BatteryHV_Driveline" time="0.57625"/>
<testcase classname="BatteryHV_UnitTest" name="blockParameters_BatteryHV_Electrical" time="0.6251"/>
</testsuite>
<testsuite errors="0" failures="0" name="BatteryHV_UnitTest_MQC" skipped="0" tests="43" time="68.8539">
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_CallbackButtons_1" time="1.6524"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_2" time="2.3586"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_3" time="2.1228"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_4" time="2.2241"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Model_TableBased_1" time="0.88667"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Model_TableBased_2" time="1.8897"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_SimulationCase_1" time="4.9102"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_SimulationCase_2" time="6.232"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_SimulationCase_3" time="4.0668"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_SimulationCase_4" time="3.6828"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_1" time="0.19522"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_2" time="0.18002"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_3" time="0.18984"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_4" time="0.1776"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_5" time="0.22865"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_6" time="0.0060656"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_7" time="0.46321"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_8" time="0.43927"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_9" time="0.45773"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_10" time="0.45123"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Configuration_11" time="0.31967"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Utility_1" time="0.011791"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Utility_2" time="0.0087548"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Utility_3" time="0.43389"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Utility_4" time="0.6226"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Utility_5" time="3.5445"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_TopFolder_1" time="0.0076529"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_TopFolder_2" time="0.0091606"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_TopFolder_3" time="0.011358"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_TopFolder_4" time="0.0080551"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_TopFolder_5" time="0.01856"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_Basic,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Constant)" time="2.1594"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_Basic,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Charge)" time="1.9844"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_Basic,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Discharge)" time="2.0906"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_Basic,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Random)" time="2.1772"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_SystemSimple,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Constant)" time="2.4926"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_SystemSimple,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Charge)" time="2.3731"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_SystemSimple,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Discharge)" time="2.5143"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_SystemSimple,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Random)" time="2.6808"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_System,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Constant)" time="3.1607"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_System,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Charge)" time="3.0449"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_System,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Discharge)" time="3.0409"/>
<testcase classname="BatteryHV_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@BatteryHV_useRefsub_System,loadSimulationCaseFunction=@BatteryHV_loadSimulationCase_Random)" time="3.324"/>
</testsuite>
</testsuites>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="CtrlEnv_UnitTest_MQC" skipped="0" tests="15" time="92.5865">
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_CallbackButtons_1" time="7.1466"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Harness_1" time="10.8462"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Harness_2" time="0.01514"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_SimulationCase_1" time="10.9347"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_SimulationCase_2" time="15.2655"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_SimulationCase_3" time="10.4517"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_SimulationCase_4" time="9.9845"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_SimulationCase_5" time="13.1401"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_1" time="0.34759"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_2" time="0.32602"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_3" time="0.33149"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_4" time="0.34464"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_5" time="0.3298"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Configuration_6" time="0.32359"/>
<testcase classname="CtrlEnv_UnitTest_MQC" name="MQC_Utility_1" time="12.7988"/>
</testsuite>
</testsuites>
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="MotorDriveUnit_UnitTest_MQC" skipped="0" tests="43" time="115.11">
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_CallbackButtons_1" time="4.3853"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TopFolder_1" time="0.015038"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TopFolder_2" time="0.025414"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TopFolder_3" time="0.0077736"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TopFolder_4" time="0.013321"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_loadSim_1" time="0.59365"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_loadSim_2" time="0.4633"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_loadSim_3" time="0.50831"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_loadSim_4" time="0.8769"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_loadSim_5" time="0.51073"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_setInit" time="0.0063539"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_useRefsub_1" time="0.42379"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_useRefsub_2" time="0.3875"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_useRefsub_3" time="0.5645"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_useRefsub_4" time="0.58998"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Configurarion_useRefsub_5" time="0.55969"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_1" time="3.7076"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_2" time="0.011114"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Notes_1" time="0.76098"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Notes_2" time="1.6848"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TestCases_1" time="8.9569"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TestCases_2" time="8.1687"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TestCases_3" time="8.81"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_TestCases_4" time="5.603"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Utility_1" time="0.51968"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Utility_2" time="0.15129"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Utility_3" time="0.10761"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_Basic,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Constant)" time="3.1727"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_Basic,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Drive)" time="3.3396"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_Basic,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Random)" time="4.2465"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_Basic,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_RegenBrake)" time="3.4994"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_BasicThermal,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Constant)" time="4.3454"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_BasicThermal,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Drive)" time="4.3753"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_BasicThermal,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Random)" time="4.5915"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_BasicThermal,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_RegenBrake)" time="4.2305"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_System,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Constant)" time="4.412"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_System,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Drive)" time="4.427"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_System,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Random)" time="5.055"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_System,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_RegenBrake)" time="4.4001"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_SystemTable,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Constant)" time="4.0796"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_SystemTable,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Drive)" time="3.9361"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_SystemTable,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_Random)" time="4.4901"/>
<testcase classname="MotorDriveUnit_UnitTest_MQC" name="MQC_Harness_combination_1(useRefSubFunction=@MotorDriveUnit_useRefsub_SystemTable,loadSimulationCaseFunction=@MotorDriveUnit_loadCase_RegenBrake)" time="4.096"/>
</testsuite>
</testsuites>
24 changes: 24 additions & 0 deletions Components/Vehicle1D/Test/Vehicle1D_TestResults_R2023b.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<testsuites>
<testsuite errors="0" failures="0" name="Vehicle1D_UnitTest" skipped="0" tests="1" time="1.408">
<testcase classname="Vehicle1D_UnitTest" name="blockParameters_Vehicle1D_Driveline" time="1.408"/>
</testsuite>
<testsuite errors="0" failures="0" name="Vehicle1D_UnitTest_MQC" skipped="0" tests="16" time="44.5998">
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_topfolder_1" time="0.014356"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Configuation_1" time="1.0816"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Configuation_2" time="0.57939"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Configuation_3" time="0.42373"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Configuation_4" time="0.39761"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Configuation_5" time="0.40942"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Harness_1" time="0.007475"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_TestCase_1" time="7.3124"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_TestCase_2" time="5.6869"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_TestCase_3" time="6.0374"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_TestCase_4" time="5.9467"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Utility_1" time="3.9373"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Utility_2" time="1.1857"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Utility_3" time="6.1782"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Utility_4" time="4.9639"/>
<testcase classname="Vehicle1D_UnitTest_MQC" name="MQC_Utility_5" time="0.43771"/>
</testsuite>
</testsuites>
Loading

0 comments on commit 355f328

Please sign in to comment.