Skip to content

Commit

Permalink
Merge pull request #3 from michael-heinrich/master
Browse files Browse the repository at this point in the history 
Updates with minimal throttling factor
  • Loading branch information
@michael-heinrich
michael-heinrich authored Jan 10, 2018
2 parents 718f6c0 + f998147 commit dbadd17
Show file tree
Hide file tree
Showing 63 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions .torcs.rc
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
TORCS_BASE = /home/jonas/torcs/torcs-1.3.7
MAKE_DEFAULT = /home/jonas/torcs/torcs-1.3.7/Make-default.mk
TORCS_BASE = /home/michaelheinrich/github/torcs-1.3.7
MAKE_DEFAULT = /home/michaelheinrich/github/torcs-1.3.7/Make-default.mk
2 changes: 1 addition & 1 deletion export/include/3D/Basic.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
2 changes: 1 addition & 1 deletion export/include/3D/Matrix.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
2 changes: 1 addition & 1 deletion export/include/3D/Point.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
2 changes: 1 addition & 1 deletion export/include/3D/Quaternion.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
2 changes: 1 addition & 1 deletion export/include/3D/Tuple3.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
2 changes: 1 addition & 1 deletion export/include/3D/Tuple4.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
2 changes: 1 addition & 1 deletion export/include/3D/Vector.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
2 changes: 1 addition & 1 deletion export/include/SOLID/solid.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
2 changes: 1 addition & 1 deletion export/include/car.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/car.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/car.h
2 changes: 1 addition & 1 deletion export/include/client.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/client/client.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/client.h
2 changes: 1 addition & 1 deletion export/include/controlconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/controlconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/controlconfig.h
2 changes: 1 addition & 1 deletion export/include/driverconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/driverconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/driverconfig.h
2 changes: 1 addition & 1 deletion export/include/exitmenu.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/client/exitmenu.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/exitmenu.h
2 changes: 1 addition & 1 deletion export/include/glfeatures.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
2 changes: 1 addition & 1 deletion export/include/graphconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/graphconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/graphconfig.h
2 changes: 1 addition & 1 deletion export/include/graphic.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/graphic.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/graphic.h
2 changes: 1 addition & 1 deletion export/include/joystickconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
2 changes: 1 addition & 1 deletion export/include/learning/ANN.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ANN.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ANN.h
2 changes: 1 addition & 1 deletion export/include/learning/Distribution.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/Distribution.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/Distribution.h
2 changes: 1 addition & 1 deletion export/include/learning/List.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/List.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/List.h
2 changes: 1 addition & 1 deletion export/include/learning/MathFunctions.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/MathFunctions.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/MathFunctions.h
2 changes: 1 addition & 1 deletion export/include/learning/ann_policy.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ann_policy.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ann_policy.h
2 changes: 1 addition & 1 deletion export/include/learning/learn_debug.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/learn_debug.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/learn_debug.h
2 changes: 1 addition & 1 deletion export/include/learning/policy.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/policy.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/policy.h
2 changes: 1 addition & 1 deletion export/include/learning/real.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/real.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/real.h
2 changes: 1 addition & 1 deletion export/include/learning/string_utils.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/learning/string_utils.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/string_utils.h
2 changes: 1 addition & 1 deletion export/include/mouseconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
2 changes: 1 addition & 1 deletion export/include/musicplayer/OggSoundStream.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
2 changes: 1 addition & 1 deletion export/include/musicplayer/OpenALMusicPlayer.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
2 changes: 1 addition & 1 deletion export/include/musicplayer/SoundStream.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
2 changes: 1 addition & 1 deletion export/include/musicplayer/musicplayer.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
2 changes: 1 addition & 1 deletion export/include/openglconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/openglconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/openglconfig.h
2 changes: 1 addition & 1 deletion export/include/os.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/os.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/os.h
2 changes: 1 addition & 1 deletion export/include/osspec.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/linux/osspec.h
/home/michaelheinrich/github/torcs-1.3.7/src/linux/osspec.h
2 changes: 1 addition & 1 deletion export/include/playerpref.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/playerpref.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/playerpref.h
2 changes: 1 addition & 1 deletion export/include/portability.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/portability/portability.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/portability/portability.h
2 changes: 1 addition & 1 deletion export/include/raceinit.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
2 changes: 1 addition & 1 deletion export/include/raceman.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/raceman.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/raceman.h
2 changes: 1 addition & 1 deletion export/include/racescreens.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/racescreens/racescreens.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/racescreens/racescreens.h
2 changes: 1 addition & 1 deletion export/include/replay.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/replay.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/replay.h
2 changes: 1 addition & 1 deletion export/include/robot.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/robot.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/robot.h
2 changes: 1 addition & 1 deletion export/include/robottools.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/robottools/robottools.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/robottools/robottools.h
2 changes: 1 addition & 1 deletion export/include/screen_properties.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
2 changes: 1 addition & 1 deletion export/include/simu.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/simu.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/simu.h
2 changes: 1 addition & 1 deletion export/include/simuconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/simuconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/simuconfig.h
2 changes: 1 addition & 1 deletion export/include/singleplayer.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
2 changes: 1 addition & 1 deletion export/include/soundconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/soundconfig.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/soundconfig.h
2 changes: 1 addition & 1 deletion export/include/telemetry.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/telemetry.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/telemetry.h
2 changes: 1 addition & 1 deletion export/include/tgf.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/tgf.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/tgf.h
2 changes: 1 addition & 1 deletion export/include/tgfclient.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
2 changes: 1 addition & 1 deletion export/include/tmath/linalg_t.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/math/linalg_t.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/linalg_t.h
2 changes: 1 addition & 1 deletion export/include/tmath/straight2_t.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/math/straight2_t.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/straight2_t.h
2 changes: 1 addition & 1 deletion export/include/tmath/v2_t.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/math/v2_t.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v2_t.h
2 changes: 1 addition & 1 deletion export/include/tmath/v3_t.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/math/v3_t.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v3_t.h
2 changes: 1 addition & 1 deletion export/include/tmath/v4_t.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/math/v4_t.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v4_t.h
2 changes: 1 addition & 1 deletion export/include/track.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/interfaces/track.h
/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/track.h
2 changes: 1 addition & 1 deletion export/include/xml.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xml.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xml.h
2 changes: 1 addition & 1 deletion export/include/xmlparse.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xmlparse.h
/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xmlparse.h
2 changes: 1 addition & 1 deletion export/lib/libsolid.a
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
4 changes: 2 additions & 2 deletions src/drivers/hemic/hemic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,9 @@ drive(int index, tCarElt* car, tSituation *s)
car->ctrl.gear = gear;


bool moves = speed > 1;
bool moves = speed > 1 || speedLim <= 5;

if (moves)
if (moves || throttling == 0)
{
bot->lastMoveStep = bot->currentStep;
bot->hasLaunched = true;
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/hemic/hemic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#define THROTTLING_P_LIM 0.1

#define MAX_THROTTLING 1.0
#define MIN_THROTTLING 0.3
#define MIN_THROTTLING 0.0
//#define NOMINAL_REL_POSITION 0.5
#define NOMINAL_REL_POSITION 0.5

Expand Down
Binary file removed src/libs/txml/gennmtab/gennmtab
View file
Binary file not shown.

0 comments on commit dbadd17

Please sign in to comment.