diff --git a/local_lib_people_prediction/.cproject b/local_lib_people_prediction/.cproject
index 8974444231935bb5e277c81a741fd5021814dbd0..bb02f58b96d2c7de1cdd11d0a68ee4c34a741a89 100644
--- a/local_lib_people_prediction/.cproject
+++ b/local_lib_people_prediction/.cproject
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
- <cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.889107241">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.889107241" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+ <cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.127626054">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.127626054" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<externalSettings/>
<extensions>
+ <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+ <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.889107241" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
- <folderInfo id="cdt.managedbuild.config.gnu.exe.debug.889107241." name="/" resourcePath="">
- <toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1183591273" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
- <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1546846435" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
- <builder buildPath="${workspace_loc:/ASSAOP_local_lib}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1120136049" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.1684962815" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.388215046" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
- <option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1289022139" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
- <option id="gnu.cpp.compiler.exe.debug.option.debugging.level.2040451658" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1447303397" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.127626054" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+ <folderInfo id="cdt.managedbuild.config.gnu.exe.debug.127626054." name="/" resourcePath="">
+ <toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1209723250" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+ <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1675346232" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+ <builder buildPath="${workspace_loc:/lib c++ aspsi}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1362701676" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.1600934234" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2032993034" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+ <option id="gnu.cpp.compiler.exe.debug.option.optimization.level.475169970" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+ <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1630861024" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" valueType="enumerated"/>
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1466324987" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1415958909" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
- <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.226115432" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
- <option id="gnu.c.compiler.exe.debug.option.debugging.level.1777081777" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.249879200" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1081729497" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+ <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.376392694" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+ <option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1993641666" superClass="gnu.c.compiler.exe.debug.option.debugging.level" valueType="enumerated"/>
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1458563588" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1686759107" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1931907191" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.14678906" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.556979058" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.2061170733" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.193648508" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.2080890202" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.2032072877" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1406463292" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1923119945" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
@@ -46,44 +46,44 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
- <cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1684101099">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1684101099" moduleId="org.eclipse.cdt.core.settings" name="Release">
+ <cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1903042755">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1903042755" moduleId="org.eclipse.cdt.core.settings" name="Release">
<externalSettings/>
<extensions>
+ <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+ <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
- <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1684101099" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
- <folderInfo id="cdt.managedbuild.config.gnu.exe.release.1684101099." name="/" resourcePath="">
- <toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.425094882" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
- <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.98734625" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
- <builder buildPath="${workspace_loc:/ASSAOP_local_lib}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.1155415598" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.660830361" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1849017997" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
- <option id="gnu.cpp.compiler.exe.release.option.optimization.level.339633967" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
- <option id="gnu.cpp.compiler.exe.release.option.debugging.level.977537281" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1896176939" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1903042755" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+ <folderInfo id="cdt.managedbuild.config.gnu.exe.release.1903042755." name="/" resourcePath="">
+ <toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.30381618" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+ <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.970325230" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+ <builder buildPath="${workspace_loc:/lib c++ aspsi}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.431630271" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.763407347" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.850495135" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+ <option id="gnu.cpp.compiler.exe.release.option.optimization.level.143158532" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+ <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.1024805127" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" valueType="enumerated"/>
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1531506522" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.959999503" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
- <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1494114723" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
- <option id="gnu.c.compiler.exe.release.option.debugging.level.294833480" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1373801358" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1162686074" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+ <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.927079184" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+ <option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.1626121376" superClass="gnu.c.compiler.exe.release.option.debugging.level" valueType="enumerated"/>
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1171280357" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.2048064767" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.679922827" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1941846859" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1340943543" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.729685767" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.43125702" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1568794405" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.2098164552" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.428516505" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.452556681" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
@@ -92,38 +92,38 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <project id="ASSAOP_local_lib.cdt.managedbuild.target.gnu.exe.936367760" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+ <project id="lib c++ aspsi.cdt.managedbuild.target.gnu.exe.1354904636" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.32037006;cdt.managedbuild.config.gnu.cross.exe.debug.32037006.;cdt.managedbuild.tool.gnu.cross.c.compiler.355107493;cdt.managedbuild.tool.gnu.c.compiler.input.415815349">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1684101099;cdt.managedbuild.config.gnu.exe.release.1684101099.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1849017997;cdt.managedbuild.tool.gnu.cpp.compiler.input.1896176939">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1684101099;cdt.managedbuild.config.gnu.exe.release.1684101099.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1849017997;cdt.managedbuild.tool.gnu.cpp.compiler.input.1896176939">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.889107241;cdt.managedbuild.config.gnu.exe.debug.889107241.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1415958909;cdt.managedbuild.tool.gnu.c.compiler.input.249879200">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.108563199;cdt.managedbuild.config.gnu.exe.release.108563199.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1211854380;cdt.managedbuild.tool.gnu.c.compiler.input.683565502">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.152074145;cdt.managedbuild.config.gnu.cross.exe.release.152074145.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1498925651;cdt.managedbuild.tool.gnu.cpp.compiler.input.1871979781">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1830124302;cdt.managedbuild.config.gnu.exe.debug.1830124302.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.129448340;cdt.managedbuild.tool.gnu.c.compiler.input.1794837280">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1903042755;cdt.managedbuild.config.gnu.exe.release.1903042755.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1162686074;cdt.managedbuild.tool.gnu.c.compiler.input.1171280357">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.152074145;cdt.managedbuild.config.gnu.cross.exe.release.152074145.;cdt.managedbuild.tool.gnu.cross.c.compiler.1546578144;cdt.managedbuild.tool.gnu.c.compiler.input.567643681">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1830124302;cdt.managedbuild.config.gnu.exe.debug.1830124302.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.129448340;cdt.managedbuild.tool.gnu.c.compiler.input.1794837280">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.889107241;cdt.managedbuild.config.gnu.exe.debug.889107241.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1415958909;cdt.managedbuild.tool.gnu.c.compiler.input.249879200">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.152074145;cdt.managedbuild.config.gnu.cross.exe.release.152074145.;cdt.managedbuild.tool.gnu.cross.c.compiler.1546578144;cdt.managedbuild.tool.gnu.c.compiler.input.567643681">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.108563199;cdt.managedbuild.config.gnu.exe.release.108563199.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.813424575;cdt.managedbuild.tool.gnu.cpp.compiler.input.537017731">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.127626054;cdt.managedbuild.config.gnu.exe.debug.127626054.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2032993034;cdt.managedbuild.tool.gnu.cpp.compiler.input.1466324987">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.889107241;cdt.managedbuild.config.gnu.exe.debug.889107241.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.388215046;cdt.managedbuild.tool.gnu.cpp.compiler.input.1447303397">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.32037006;cdt.managedbuild.config.gnu.cross.exe.debug.32037006.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1731729740;cdt.managedbuild.tool.gnu.cpp.compiler.input.1024819215">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.108563199;cdt.managedbuild.config.gnu.exe.release.108563199.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1211854380;cdt.managedbuild.tool.gnu.c.compiler.input.683565502">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.152074145;cdt.managedbuild.config.gnu.cross.exe.release.152074145.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1498925651;cdt.managedbuild.tool.gnu.cpp.compiler.input.1871979781">
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.32037006;cdt.managedbuild.config.gnu.cross.exe.debug.32037006.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1731729740;cdt.managedbuild.tool.gnu.cpp.compiler.input.1024819215">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1684101099;cdt.managedbuild.config.gnu.exe.release.1684101099.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.959999503;cdt.managedbuild.tool.gnu.c.compiler.input.1373801358">
@@ -132,6 +132,18 @@
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1830124302;cdt.managedbuild.config.gnu.exe.debug.1830124302.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1723483156;cdt.managedbuild.tool.gnu.cpp.compiler.input.881860197">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.32037006;cdt.managedbuild.config.gnu.cross.exe.debug.32037006.;cdt.managedbuild.tool.gnu.cross.c.compiler.355107493;cdt.managedbuild.tool.gnu.c.compiler.input.415815349">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1903042755;cdt.managedbuild.config.gnu.exe.release.1903042755.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.850495135;cdt.managedbuild.tool.gnu.cpp.compiler.input.1531506522">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.108563199;cdt.managedbuild.config.gnu.exe.release.108563199.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.813424575;cdt.managedbuild.tool.gnu.cpp.compiler.input.537017731">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.127626054;cdt.managedbuild.config.gnu.exe.debug.127626054.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1081729497;cdt.managedbuild.tool.gnu.c.compiler.input.1458563588">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/local_lib_people_prediction/.settings/language.settings.xml b/local_lib_people_prediction/.settings/language.settings.xml
index e8be6d5a410d7ce0703579a89bffc17f9488708b..3004e24f73f57bc8a5d3b8b6265e1f49a5969eba 100644
--- a/local_lib_people_prediction/.settings/language.settings.xml
+++ b/local_lib_people_prediction/.settings/language.settings.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
- <configuration id="cdt.managedbuild.config.gnu.cross.exe.debug.32037006" name="Debug">
+ <configuration id="cdt.managedbuild.config.gnu.exe.debug.127626054" name="Debug">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
- <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-913847163843620227" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
+ <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-586311654608063718" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
</extension>
</configuration>
- <configuration id="cdt.managedbuild.config.gnu.cross.exe.release.152074145" name="Release">
+ <configuration id="cdt.managedbuild.config.gnu.exe.release.1903042755" name="Release">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
- <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-913847163843620227" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
+ <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-586311654608063718" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
</extension>
</configuration>
-</project>
+</project>
\ No newline at end of file
diff --git a/local_lib_people_prediction/bin/prediction_example b/local_lib_people_prediction/bin/prediction_example
index 55f69720edec9dff044f24f4a2ce3c573396aab7..76db4942a674ba78525895b5ba2e066b8037630f 100755
Binary files a/local_lib_people_prediction/bin/prediction_example and b/local_lib_people_prediction/bin/prediction_example differ
diff --git a/local_lib_people_prediction/src/nav/plan_local_nav.cpp b/local_lib_people_prediction/src/nav/plan_local_nav.cpp
index b889e3cd7bdfee3fad0dad1e163fad3945c12b08..194724c8258aa31edee5566c477dfd53c9b80e23 100644
--- a/local_lib_people_prediction/src/nav/plan_local_nav.cpp
+++ b/local_lib_people_prediction/src/nav/plan_local_nav.cpp
@@ -361,7 +361,7 @@ bool Cplan_local_nav::robot_plan_companion3(Spose& pose_command, Cperson_abstrac
actual_person_Companion_pointer_=person_obj_companion_person;
}
//std::cout <<"5 In Local Lib ASSAOP robot_plan_companion3"<< std::endl;
- if(output_screen_messages_){
+ if((in_debug_all_IVO_)||(in_debug_few_IVO_)){
std::cout <<" IMPORTANT!!! before_initial_angle_="<<before_initial_angle_<<"; angle_companion_="<<angle_companion_<< std::endl;
}
@@ -593,9 +593,9 @@ bool Cplan_local_nav::robot_plan_companion3(Spose& pose_command, Cperson_abstrac
break;
case ITER:
- //if(output_screen_messages_){
- //std::cout <<"ATR companion ITER"<< std::endl;
- //}
+ if(in_debug_all_IVO_){
+ std::cout <<"ATR companion ITER"<< std::endl;
+ }
change_final_robot_orientation_=false;
go_behid_comp_person_=true;
goal1_=3;
@@ -617,7 +617,7 @@ bool Cplan_local_nav::robot_plan_companion3(Spose& pose_command, Cperson_abstrac
act_result=robot_plan_companion2(pose_command, reactive,dt);
//std::cout <<" despues de robot_plan_companion2 "<< std::endl;
- if(output_screen_messages_){
+ if(in_debug_all_IVO_){
std::cout <<"COMPANION after robot_plan_companion2; pose_command.v="<<pose_command.v<<"; pose_command.w="<<pose_command.w<< std::endl;
}
@@ -778,7 +778,7 @@ bool Cplan_local_nav::robot_plan_companion3(Spose& pose_command, Cperson_abstrac
}
// FIN SAVE IN FILE
- if(output_screen_messages_){
+ if((in_debug_all_IVO_)||(in_debug_few_IVO_)){
std::cout << "(2) OUTPUT ROBOT PLAN 3 pose_command.v="<<pose_command.v<<"; pose_command.w="<<pose_command.w<< std::endl;
}
return act_result;
@@ -1896,7 +1896,7 @@ if(((pointer_to_person_companion_->get_current_pointV().v()>0.2))){ //&&(change_
// INI Case Only One person accompaniment.
//std::cout << " In last goal people stop 2 "<< std::endl;
if((pointer_to_person_companion_->get_current_pointV().v()<0.2)){
- if(output_screen_messages_){
+ if(in_debug_all_IVO_){
std::cout << " fist pers IMPORTANTE ENTRO EN FRENAR!!! "<< std::endl;
} //TODO: el frenado "lento" para el caso de 1 persona NO acaba de ir bien. De momento lo dejo en comentario
// intentar en un futuro si puedo hacerlo bien.
@@ -2319,37 +2319,52 @@ if(((pointer_to_person_companion_->get_current_pointV().v()>0.2))){ //&&(change_
{
case 1: //case best the robot_goal_negativo_
person_companion_position=robot_goal_negativo_;//.x += (robot_person_proximity_distance_)*cos(theta + angle_companion_*3.14/180);
- // std::cout << " [case1](robot_goal_negativo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " [case1](robot_goal_negativo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
break;
case 2: //case best the robot_goal_positivo_
person_companion_position=robot_goal_positivo_;//.x += (robot_person_proximity_distance_)*cos(theta - (angle_companion_*3.14/180));
- //std::cout << " [case2](robot_goal_positivo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " [case2](robot_goal_positivo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
break;
case 3:
if(min_dist_colli_n>min_dist_colli_p){ //case best the robot_goal_negativo_
person_companion_position=robot_goal_negativo_;
- //std::cout << " [case_act=3] min_dist_colli_n= "<< min_dist_colli_n <<"; > min_dist_colli_p="<<min_dist_colli_p<< std::endl;
- //std::cout << " [case3](robot_goal_negativo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " [case_act=3] min_dist_colli_n= "<< min_dist_colli_n <<"; > min_dist_colli_p="<<min_dist_colli_p<< std::endl;
+ std::cout << " [case3](robot_goal_negativo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
+
}else{ //case best the robot_goal_positivo_
person_companion_position=robot_goal_positivo_;
- //std::cout << " [case_act=3] min_dist_colli_n= "<< min_dist_colli_n <<"; < min_dist_colli_p="<<min_dist_colli_p<< std::endl;
- //std::cout << " [case3](robot_goal_positivo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " [case_act=3] min_dist_colli_n= "<< min_dist_colli_n <<"; < min_dist_colli_p="<<min_dist_colli_p<< std::endl;
+ std::cout << " [case3](robot_goal_positivo_) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
}
break;
default:
case 0:
- // std::cout << " [case_act=0 or default] min_dist_colli_p= "<< min_dist_colli_p<<"; min_dist_colli_n="<<min_dist_colli_n << std::endl;
- // darle el goal al lado de la persona.
+ if(in_debug_all_IVO_){
+ std::cout << " [case_act=0 or default] min_dist_colli_p= "<< min_dist_colli_p<<"; min_dist_colli_n="<<min_dist_colli_n << std::endl;
+ }
+ // darle el goal al lado de la persona.
if( diffangle(theta, angle) < 0 )
{
person_companion_position=robot_goal_positivo_;
- //std::cout << " (robot_goal_positivo_) case reactive (1) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " (robot_goal_positivo_) case reactive (1) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x<< " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
}
else // es como si hiciera una circunferencia al rededor de la persona. (se intenta poner a un lado o a otro de la persona. segun esos angulos)
{
person_companion_position=robot_goal_negativo_;
- // std::cout << " (robot_goal_negativo_) case reactive (2) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x << " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ if(in_debug_all_IVO_){
+ std::cout << " (robot_goal_negativo_) case reactive (2) (ROBOT GOAL) person_companion_position.x=" <<person_companion_position.x << " person_companion_position.y=" <<person_companion_position.y<< std::endl;
+ }
}
break;
}
diff --git a/local_lib_people_prediction/src/nav/plan_local_nav.h b/local_lib_people_prediction/src/nav/plan_local_nav.h
index 2a3757fff87b0d0d1984bff7d0cf3cc49936010c..a4a91d10b0c7c02b97e777c8cc0bca402e81861d 100644
--- a/local_lib_people_prediction/src/nav/plan_local_nav.h
+++ b/local_lib_people_prediction/src/nav/plan_local_nav.h
@@ -158,6 +158,10 @@ class Cplan_local_nav : public Cprediction_behavior
void set_distance_to_stop( double d ){ distance_to_stop_ = d; }
double get_distance_to_stop( ) { return distance_to_stop_;}
+ void set_debug_all_IVO( bool in_debug_all_IVO ){ in_debug_all_IVO_ = in_debug_all_IVO; }
+ void set_debug_few_IVO( bool in_debug_few_IVO ){ in_debug_few_IVO_ = in_debug_few_IVO; }
+
+
/**
* Return info methods
*/
@@ -1284,6 +1288,7 @@ class Cplan_local_nav : public Cprediction_behavior
bool see_save_in_file_;
bool output_screen_messages_;
+ bool in_debug_few_IVO_, in_debug_all_IVO_;
SpointV calcular_goal_frenado(){
// INI calcular goal final caso frenado.