0000000000000000000000000000000000000000 2ff039b4cb0a6b9611e4ab4dee9cbdbca321c8fd Philippe Greiner <philippe.greiner@student.uclouvain.be> 1474375390 +0200	commit (initial): Initial commit
2ff039b4cb0a6b9611e4ab4dee9cbdbca321c8fd 85d1297895b18632e6f6742237bcbd53c9b92b40 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1474375835 +0200	merge refs/remotes/origin/master: Fast-forward
85d1297895b18632e6f6742237bcbd53c9b92b40 6603863d79d5413664ab43da57a636cdb3e2b4fe Philippe Greiner <philippe.greiner@student.uclouvain.be> 1475742497 +0200	commit: 3D to 2D modifications
6603863d79d5413664ab43da57a636cdb3e2b4fe f49a9d86f37d0367b14c72f923142406af64f6d7 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1475766265 +0200	commit: compiles with everything (?) modified for 2D
f49a9d86f37d0367b14c72f923142406af64f6d7 fc9a2c93d4796a3d791e4c4767d65db062d217b8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1475767476 +0200	commit: Added include for Matsuoka2D
fc9a2c93d4796a3d791e4c4767d65db062d217b8 92d029c45f0be7839bce118a323adadf1b0fa4f2 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476173667 +0200	commit: Added opti parameters
92d029c45f0be7839bce118a323adadf1b0fa4f2 755c96a5079c5ce4fffaa797b8ef0a788f6b8bf6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476178015 +0200	pull: Fast-forward
755c96a5079c5ce4fffaa797b8ef0a788f6b8bf6 c98f486a7a1478f145c7b49c7ea835409df7592c Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476349036 +0200	commit: Added windows compilation files, modified opti files
c98f486a7a1478f145c7b49c7ea835409df7592c 471cc10834d5b364912d54c6988c63e0e3c76b69 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476349545 +0200	commit: Deleted old Matsuoka2D files
471cc10834d5b364912d54c6988c63e0e3c76b69 d85949a38d4f994e6c48f6bec3f18fb46b763df3 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476351110 +0200	commit: Add realtime lib linkage
d85949a38d4f994e6c48f6bec3f18fb46b763df3 6cefb4d538853d6c3307be1d3425cbbee7dd6dde Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476370850 +0200	pull: Fast-forward
6cefb4d538853d6c3307be1d3425cbbee7dd6dde 40f60e0c0369ae295598b3758a7703e29e3608f5 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476449867 +0200	commit: Non-sagittal DOF's controlled in position when no 3D
40f60e0c0369ae295598b3758a7703e29e3608f5 4da3f4606de1fae0a2feea1bc60a7acfc835f444 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476454282 +0200	commit: Set parameters back to normal
4da3f4606de1fae0a2feea1bc60a7acfc835f444 4d4db25ab8e8a7fc13dbbe0ec1df63901ee86a3b Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476460120 +0200	commit: Corrected MinDistFitness.cc
4d4db25ab8e8a7fc13dbbe0ec1df63901ee86a3b 281de4551c71ca8c7d1d16ba193fcfce8472b21e Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476788422 +0200	commit: Ready to optimize on a range
281de4551c71ca8c7d1d16ba193fcfce8472b21e c8c0d28c33844ff2f1f1cfcc2ad6ea3b232f2fa5 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476807776 +0200	commit: Changed # of simulations for mean fitness to 3
c8c0d28c33844ff2f1f1cfcc2ad6ea3b232f2fa5 d2fa341f739ebe75396eb487e9b2b8c97fd4ceeb Philippe Greiner <philippe.greiner@student.uclouvain.be> 1476967971 +0200	commit: trying to control speed
d2fa341f739ebe75396eb487e9b2b8c97fd4ceeb 61d105ddcb88a23e26666db1600e15a39e5bca6a Philippe Greiner <philippe.greiner@student.uclouvain.be> 1477411472 +0200	commit: Analysis of gait for different speeds
61d105ddcb88a23e26666db1600e15a39e5bca6a d41db2e7496ed55d3021123455d6c809e5ee4687 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478168712 +0100	commit: Added higher obstacles in training ground
d41db2e7496ed55d3021123455d6c809e5ee4687 9cb3200f8d8c63614501ea440a849627f833c5c6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478177067 +0100	commit: Added (untested) stepheightfitness
9cb3200f8d8c63614501ea440a849627f833c5c6 4fa152f1fad6339c278b829615b8cbef89857708 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478557481 +0100	commit: enabled outputs to be saved and added animpath
4fa152f1fad6339c278b829615b8cbef89857708 0d827508815287a99c9145b76d46f077f1b8bdda Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478641714 +0100	commit: switched to openGL
0d827508815287a99c9145b76d46f077f1b8bdda 1858d9ce11f44e70a79c8825d8fe4eb54bf54281 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478647816 +0100	commit: Added variables to reflect Geyer, 2015 MTU changes
1858d9ce11f44e70a79c8825d8fe4eb54bf54281 5fe66150dacaa1034980e6067ef8cb78cbe7b01f Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478688232 +0100	commit: Applied changes to pitch muscles GAS, VAS, SOL, TA as in geyer 2015
5fe66150dacaa1034980e6067ef8cb78cbe7b01f e4c03061090b12971b4e483c27489dced10d27fd Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478694519 +0100	commit: New token, changed PSO params
e4c03061090b12971b4e483c27489dced10d27fd 191776b480477698b183821ba93e00f446f4de2e Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478705054 +0100	pull: Fast-forward
191776b480477698b183821ba93e00f446f4de2e 0f3c17ccb7a64579c5aafbb0119ffedcad531647 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478865693 +0100	commit: Reverted muscle changes
0f3c17ccb7a64579c5aafbb0119ffedcad531647 51c5bc4e5f3e3a040711b0a37d8ecdd457166e74 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1478884334 +0100	commit: Added BFSH and RF, only active in initial stance
51c5bc4e5f3e3a040711b0a37d8ecdd457166e74 61afcf051d7c6e5584eabf1378bbb4f93aa5318f Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479142014 +0100	commit: strucural changes for new muscles geyer 2015
61afcf051d7c6e5584eabf1378bbb4f93aa5318f 0b4a805b6b91985a3c1efd69fb44caf45f0def4a Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479144939 +0100	commit: Added and modified parameters, now synchronized with geyer 2015
0b4a805b6b91985a3c1efd69fb44caf45f0def4a 0c107de8b877065c8ea0183c4372e73f35971ab4 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479145180 +0100	commit: New token, opti params, TA error corrected
0c107de8b877065c8ea0183c4372e73f35971ab4 b707dd357192f4f0737c0b9b7e15c4095f9b9eb8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479302272 +0100	commit: Matsuoka2D cleaned up, new opti params
b707dd357192f4f0737c0b9b7e15c4095f9b9eb8 64ccdefacd55c904fcf0a4c276126f3512face60 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479302604 +0100	pull: Fast-forward
64ccdefacd55c904fcf0a4c276126f3512face60 64ccdefacd55c904fcf0a4c276126f3512face60 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479306123 +0100	checkout: moving from master to moreNeurons
64ccdefacd55c904fcf0a4c276126f3512face60 3c6a2da41bfc592ae0107db4ee32a9cabb2cc418 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479315129 +0100	commit: Corrected stepheightfitness
3c6a2da41bfc592ae0107db4ee32a9cabb2cc418 8c5060ab412285cd0527de35ab93d740468842ec Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479457772 +0100	commit: Added StepLengthFitness and StepHeightFitness
8c5060ab412285cd0527de35ab93d740468842ec eaba2d15ceba01ed880cad600b815d2afbbe88f2 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479466164 +0100	commit: Ready to optimize on step length and height
eaba2d15ceba01ed880cad600b815d2afbbe88f2 35cc757437d441667b8defcc20b516afd51b7b9f Philippe Greiner <philippe.greiner@student.uclouvain.be> 1479908580 +0100	commit: Optimize only step length to see what inputs change
35cc757437d441667b8defcc20b516afd51b7b9f e949fc4fbe1c17f0d2d1662c729ca52903d58863 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480005846 +0100	commit: FootHeightFitness now computes with foot clearance, OptiParams only optimizes pitch params
e949fc4fbe1c17f0d2d1662c729ca52903d58863 7b2bff60c67343f17ed84a7680b3d56e27b34adb Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480061840 +0100	commit: Corrected steplengthfitness
7b2bff60c67343f17ed84a7680b3d56e27b34adb 468df737f31257ada26d082bb61cae38d797a85c Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480061862 +0100	pull: Merge made by the 'recursive' strategy.
468df737f31257ada26d082bb61cae38d797a85c ac7eefe873d3a54abc5755658722c2b74cf41dc1 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480089469 +0100	commit: Changed fitness calculation from stride to step length
ac7eefe873d3a54abc5755658722c2b74cf41dc1 a2026b8ddb990e1c09fcec8d306e7a1ef609b2ca Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480096634 +0100	commit: Changed parameters boundaries
a2026b8ddb990e1c09fcec8d306e7a1ef609b2ca 91d0102cd9c0b969729355cc6ce70b09758258e7 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480097098 +0100	pull: Fast-forward
91d0102cd9c0b969729355cc6ce70b09758258e7 223c81d000f33596d0ddf7f56200167da5358e0a Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480164259 +0100	commit: Added RF and BFSH to stimwalkctrl
223c81d000f33596d0ddf7f56200167da5358e0a 1b6db37613788375a98a2fc49a41c3b2868ab9a1 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480169803 +0100	commit: Changed OptiParams to optimize new parameters (BFSH and RF)
1b6db37613788375a98a2fc49a41c3b2868ab9a1 69002f71277068c3438c523ead87b4ae7b4022db Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480170326 +0100	pull: Fast-forward
69002f71277068c3438c523ead87b4ae7b4022db 8468f450581f7c1ec33af04c3a57d7c2033360b8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480178397 +0100	commit: Added analysis and saving of step height
8468f450581f7c1ec33af04c3a57d7c2033360b8 d59145feeec0c6ce3b86dd22ad10cd6d5ecfe59d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480179842 +0100	commit: some changes to SwingStanceAnalysis
d59145feeec0c6ce3b86dd22ad10cd6d5ecfe59d abef613ed111fc6d368f83570c6c4f828b34538a Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480277176 +0100	commit: eval_main tests the sensitivity of the parameters by apply
abef613ed111fc6d368f83570c6c4f828b34538a 3bf43d49f06129e979aa19a238fe9dde883e592d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480277238 +0100	commit: sensitivity.m plots the variations for each parameter and shows the important parameters
3bf43d49f06129e979aa19a238fe9dde883e592d 68eb266c1ce1ed60d5af49cdb1c8cc6bafe80269 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1480606161 +0100	commit: Optimization on speed to find optimal moment for parameters adapt
68eb266c1ce1ed60d5af49cdb1c8cc6bafe80269 7b4be7ad572b83e58762bfe6b4be8421033c7d08 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481109644 +0100	commit: More contraining height fitness function
7b4be7ad572b83e58762bfe6b4be8421033c7d08 1745365022671ad9c546704999af02dc8327a98d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481109672 +0100	pull: Merge made by the 'recursive' strategy.
1745365022671ad9c546704999af02dc8327a98d 17ffc000fcc4459208d79da184785f604fb5a982 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481123714 +0100	commit: Height and length now co-optimized
17ffc000fcc4459208d79da184785f604fb5a982 5c574e6ac07fd70359d83b29e20840f640f7fcba Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481194483 +0100	commit: New optimization boundaries
5c574e6ac07fd70359d83b29e20840f640f7fcba bd5680b44b6c9a779e17708dbe873318f55d3477 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481198035 +0100	commit: Ready for mass optimization
bd5680b44b6c9a779e17708dbe873318f55d3477 45e41339646a440a5648997df94152308dd09986 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481198049 +0100	pull: Merge made by the 'recursive' strategy.
45e41339646a440a5648997df94152308dd09986 07226410a94b203e6ad73fd3e67d030618872e9d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481236644 +0100	commit: Hardcoded params, wider boundaries for others
07226410a94b203e6ad73fd3e67d030618872e9d a869a456ed6adac975106b6cba7ac3ffd63d4edd Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481625826 +0100	commit: Modified graphs
a869a456ed6adac975106b6cba7ac3ffd63d4edd 38786b8341990ecae57fd843383a89f3e3f240d4 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481625852 +0100	pull: Merge made by the 'recursive' strategy.
38786b8341990ecae57fd843383a89f3e3f240d4 468c2d6aa8b96cef280b50e926658344415ebf49 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481652944 +0100	commit: Back to optimizing everything
468c2d6aa8b96cef280b50e926658344415ebf49 c6b6d047b4b155d69eaedc0a9ca6a3874ca63df3 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481740307 +0100	pull: Fast-forward
c6b6d047b4b155d69eaedc0a9ca6a3874ca63df3 83f59d94355f36b86b094b6389c4602f41bbaf77 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481742855 +0100	commit: Hard coded values for reference, optiparams now set for 6 params
83f59d94355f36b86b094b6389c4602f41bbaf77 b3684091e438a5972237ffd22d160c88c8667db5 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481756020 +0100	commit: Corrected scripts..
b3684091e438a5972237ffd22d160c88c8667db5 fa20bc8d640d1fea7965b3f001f83d8ff03f3fb2 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481756328 +0100	commit (merge): fixed conflict
fa20bc8d640d1fea7965b3f001f83d8ff03f3fb2 8027efda6dafa7f5f10a88c0c1cb5cc61baa483b Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481884188 +0100	commit: added extraction script
8027efda6dafa7f5f10a88c0c1cb5cc61baa483b 10c05f8226e732ad446107569baea9833c001e51 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481884213 +0100	pull: Merge made by the 'recursive' strategy.
10c05f8226e732ad446107569baea9833c001e51 1d0cf9eef7dafb758838e2ce4ebcc9070edbc8bb Philippe Greiner <philippe.greiner@student.uclouvain.be> 1481884444 +0100	commit: corrected script
1d0cf9eef7dafb758838e2ce4ebcc9070edbc8bb 9675713882415a49c64c28dbf81681ede1a3f734 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1482245509 +0100	commit: Better fitnesses, script ready for mesh
9675713882415a49c64c28dbf81681ede1a3f734 5d88ebd77f0a8e26b0259082ba92aeae36adbba2 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1482832312 +0100	merge refs/remotes/origin/optiHeightLength: Fast-forward
5d88ebd77f0a8e26b0259082ba92aeae36adbba2 50c59530ac64a0f8375c86aab2571a80b5c93cd6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1482832338 +0100	commit: Running sensitivity on new ref
50c59530ac64a0f8375c86aab2571a80b5c93cd6 d0025b7ecb19c577d63fe4e1dec70c6ecf1ff3f9 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1483651854 +0100	commit: Modified stimwalkctrl and matsuoka2D to control step height and length
d0025b7ecb19c577d63fe4e1dec70c6ecf1ff3f9 dec08aa24117c50b8b608bc37cce6ed6c7975a93 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1483656484 +0100	commit: Step length and height modulation works
dec08aa24117c50b8b608bc37cce6ed6c7975a93 1184e389c610fcd5ba74b51f59cf569d1df7dde6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1483695136 +0100	commit: Removed console outputs
1184e389c610fcd5ba74b51f59cf569d1df7dde6 1659cf2e0d7396281ac6675cd4d9ef61a6709444 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1483950852 +0100	commit: Modified for seamless transition from continuous control to fixed control
1659cf2e0d7396281ac6675cd4d9ef61a6709444 0512e4e3c7b289d23ea4732f54aba2c4167af405 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1484341184 +0100	commit: slight adaptation of ctrl limits
0512e4e3c7b289d23ea4732f54aba2c4167af405 efb51bbb2db222c7236e57e07a31c34dbb12b437 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1485335900 +0100	commit: Fixes #1
efb51bbb2db222c7236e57e07a31c34dbb12b437 968da285e453c905eee2c90bfba9e73b3d6901a6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1486576242 +0100	pull: Fast-forward
968da285e453c905eee2c90bfba9e73b3d6901a6 cef577a5cae53e8527ca38f5eb8097dc3b1907db Philippe Greiner <philippe.greiner@student.uclouvain.be> 1486576261 +0100	commit: Corrected RF stimulation
cef577a5cae53e8527ca38f5eb8097dc3b1907db 48537679ce2c9111552404bfac89229baf1718b7 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487283792 +0100	checkout: moving from optiHeightLength to multi_simu
48537679ce2c9111552404bfac89229baf1718b7 cef577a5cae53e8527ca38f5eb8097dc3b1907db Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487283807 +0100	checkout: moving from multi_simu to optiHeightLength
cef577a5cae53e8527ca38f5eb8097dc3b1907db d491161ae549588c3b8d6c0518555d99a15b075e Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487284871 +0100	commit (merge): Merge branch 'multi_simu' into optiHeightLength
d491161ae549588c3b8d6c0518555d99a15b075e 0cc9a5bd80cd0f62af1f26692a8139124f04005b Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487701123 +0100	commit: Fix CMakeLists to use mbsyscopy
0cc9a5bd80cd0f62af1f26692a8139124f04005b fed5912aaf2da469b5af9db956735119daff2d43 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487761064 +0100	commit: Fixed some issues related to deleting controller files
fed5912aaf2da469b5af9db956735119daff2d43 620ea464e479fb9e599349c780bf27350d1a15ac Philippe Greiner <philippe.greiner@student.uclouvain.be> 1487871151 +0100	commit: ready for optimisation
620ea464e479fb9e599349c780bf27350d1a15ac 1d16cf70aaf3fca866b05df90bd0145aebd914f3 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1489329355 +0100	commit: Changed RF and BFSH stims
1d16cf70aaf3fca866b05df90bd0145aebd914f3 ee03861615e08d9331f99c662746b8f62efb498e Philippe Greiner <philippe.greiner@student.uclouvain.be> 1489329384 +0100	pull: Merge made by the 'recursive' strategy.
ee03861615e08d9331f99c662746b8f62efb498e 362b436a07f8ca49cf2fb6de7b5a3a4e48e69bf8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490343595 +0100	commit: Back to heightlengthopti
362b436a07f8ca49cf2fb6de7b5a3a4e48e69bf8 e0fb5910ea3c922a067da6345f7974a2e6eae04d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490343778 +0100	pull: Merge made by the 'recursive' strategy.
e0fb5910ea3c922a067da6345f7974a2e6eae04d ac34498ba45f4692537fcadaeed005262f7279e3 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490347666 +0100	commit: New optimization run
ac34498ba45f4692537fcadaeed005262f7279e3 e3fe5aa6e8c981a50efc69216e85d588cb3439ac Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490352601 +0100	commit: Set default sim speed to 1
e3fe5aa6e8c981a50efc69216e85d588cb3439ac f49c49dcf7038b74cf295beb7bc4830a4f0441d0 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490362655 +0100	commit: implemented mesh opti
f49c49dcf7038b74cf295beb7bc4830a4f0441d0 fec9495bd766cb0654134e793179fa0f39f69931 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490364099 +0100	commit: Back to prev ref
fec9495bd766cb0654134e793179fa0f39f69931 784e1e67404f0377f8334c9268bffaa81c757d71 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490401620 +0100	commit: Ready for co-optimization, testing boundaries
784e1e67404f0377f8334c9268bffaa81c757d71 13024b8cbca0db1bd84905d3f9038afb5c760b73 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490465316 +0100	commit: Ready for co-optimization
13024b8cbca0db1bd84905d3f9038afb5c760b73 8075ed3cf5b960b164c39fd488ffcba39be0f2d8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1490465402 +0100	commit (merge): Fix conflict
8075ed3cf5b960b164c39fd488ffcba39be0f2d8 a3eae30f1555dfe0f9343d25a060a57aab9bd918 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1491295338 +0200	commit: Changed plots and outputs
a3eae30f1555dfe0f9343d25a060a57aab9bd918 8dbcdf90f91ce54f3e88ed60e20b5e1c1d0d0f55 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1491295350 +0200	pull: Merge made by the 'recursive' strategy.
8dbcdf90f91ce54f3e88ed60e20b5e1c1d0d0f55 24045c3409d50db4e6f5de01350c663851d739ca Philippe Greiner <philippe.greiner@student.uclouvain.be> 1491396188 +0200	commit: Ready for new coopti
24045c3409d50db4e6f5de01350c663851d739ca 40ae726f37e1c3042a9c142449130d27600d8ad4 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1491464884 +0200	commit: Improvements to coopti parameters application
40ae726f37e1c3042a9c142449130d27600d8ad4 e525a4d5e94c6ba0d4e19f740238c93b917dcdfe Philippe Greiner <philippe.greiner@student.uclouvain.be> 1491814159 +0200	commit: Longer discrete adaptations and added height lines in visu
e525a4d5e94c6ba0d4e19f740238c93b917dcdfe c8fcb36052848a7177718861e0ccd665a03741df Philippe Greiner <philippe.greiner@student.uclouvain.be> 1492001517 +0200	commit: New coopti params with mesh results
c8fcb36052848a7177718861e0ccd665a03741df e50f8ac5f2b06a7ec9eb6c60d11aeb0b8158a9c1 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1492002045 +0200	pull: Fast-forward
e50f8ac5f2b06a7ec9eb6c60d11aeb0b8158a9c1 21cfecb1691b68800948c5703b4586ec516b32ac Philippe Greiner <philippe.greiner@student.uclouvain.be> 1492002133 +0200	commit: New token
21cfecb1691b68800948c5703b4586ec516b32ac e345ae6db58c69d4f5c8969ecb3b989861cce364 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1492068497 +0200	commit: Removed modifications to mbs
e345ae6db58c69d4f5c8969ecb3b989861cce364 6471e22e1b818b61e7fc1388976f68f0caaae011 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1493486095 +0200	commit: Modified coopti boundaries
6471e22e1b818b61e7fc1388976f68f0caaae011 88c8141500683b084a22756be12c8d72999e6d7c Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494086693 +0200	commit: Added optievaluate for discrete and reg modulations
88c8141500683b084a22756be12c8d72999e6d7c 3d51efab79b8d14a62d965890b78932da962a7c0 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494147061 +0200	commit: Finished new optievaluate modules
3d51efab79b8d14a62d965890b78932da962a7c0 acabb7ce32858dc2ba15b265597b0044908b6783 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494153043 +0200	commit: Optimizing discrete modulation
acabb7ce32858dc2ba15b265597b0044908b6783 d190fd563c31e467981d98529aa2c7459bc265d9 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494159125 +0200	commit: Changed discrete params adaptation
d190fd563c31e467981d98529aa2c7459bc265d9 6534903efa2de82a293075ac87033ab9a3267066 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494172532 +0200	commit: adapted discret opti
6534903efa2de82a293075ac87033ab9a3267066 73bf7ac53ccff2b9dfe0815c91dae52e5484016f Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494236979 +0200	commit: Changed discrete stims
73bf7ac53ccff2b9dfe0815c91dae52e5484016f 1c39f0b08f5de9a81f8508924e803bc2ec298503 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494248169 +0200	commit: Corrected adapt_delay initialization
1c39f0b08f5de9a81f8508924e803bc2ec298503 cf0f75b78b7f3cde8f2d6c27fc272b51f6f0788d Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494251214 +0200	commit: Discrete adaptations...
cf0f75b78b7f3cde8f2d6c27fc272b51f6f0788d d41258c24781b627e7a4106a3f7efc76f37264a6 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494347468 +0200	pull: Fast-forward
d41258c24781b627e7a4106a3f7efc76f37264a6 8416031a39ddbfeb02f0beb85267d15ca0c78ce8 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494348138 +0200	commit: Changed opti boundaries
8416031a39ddbfeb02f0beb85267d15ca0c78ce8 30b0aae40c16f2d54ed4e9871850fa695c623adf Philippe Greiner <philippe.greiner@student.uclouvain.be> 1494693495 +0200	commit: Added outputs, modified eval_main, enable computation of var in averageinc
30b0aae40c16f2d54ed4e9871850fa695c623adf 9f88d2fedb9f2f4684296eeca1c74b160d619761 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1495436224 +0200	commit: Eval of dis mod
9f88d2fedb9f2f4684296eeca1c74b160d619761 fb916d58e54698bfe89ea8b5e5a612aaa6c45366 Philippe Greiner <philippe.greiner@student.uclouvain.be> 1496917358 +0200	commit: Cleaned up
