-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged revision(s) 20332-20472 from trunk/sumo:
updated call to typemap.h generator, refs #3, #1853 ........ fixing svn props, refs #22 ........ removed outdated comment refs #12 ........ fixing potential gui crash ........ whitespace refs #12 ........ now showing waitingTime accumulation window in gui refs #36 ........ refactoring transportable devices, refs #12 ........ post refactoring cleanup, fixing positions in FCD output with GUI, refs #12, #21 ........ fixing deviation between person and vehicle position, refs #21 ........ adding test for circular net, refs #1032 ........ only notifying about entry if the lane reminder is for the entered lane (did not work for circular nets), fix #1032 ........ fix #2189 ........ adding failing test, refs #1452, #21 ........ fixing move reminders with teleports, fix #1452 ........ added test refs #1893 ........ fix #1893 ........ added test refs #2225 ........ partial netdiff support for handling roundabouts (only creation) ........ adapting runner for new emission test cycles, refs #21 ........ using the new model files, refs #2206 ........ updating svn ignore ........ added test for #1351 ........ deprecated swap option refs #2116 ........ fixing electricity calculation, refs #2206 ........ added test fix #1968 ........ fixing defaults and units, refs #2211 ........ new phemlight version from Graz ........ documenting changes, refs #2206 ........ added assertion refs #12 ........ fix #2227 ........ fix #2226 ........ reintegrating urmo ........ persons are visible again. (regression from [20340]) ........ fix #1852 ........ fix #2192 ........ fixing some delete issues which were introduced by the urmo merge ........ fix #2056 ........ patching expected results refs #21, refs #2056 ........ another merge leftover ........ better with units, refs #2 ........ adapting to correct model, refs #21, #2206 ........ fix #2133 ........ adapting to units in help string, refs #21 ........ removing unused element from test input, refs #21 ........ added test refs #2230 ........ adapting schemata for output files, refs #2 ........ adapting to modified error messages, refs #21 ........ adapting to movereminder teleport fix, refs #21 ........ added test refs #1980 ........ fix #1980 ........ need to check embeddedness before connecting ........ fixed bug where junctions with uncommon shapes could not be selected refs #457 ........ adapting meso tests to electricity, refs #21 ........ fixing svn props, refs #22 ........ fixing plugin extraction, refs #2168 ........ fixing unused parameter warnings, refs #3 ........ adapting personTrip schema, refs #2 ........ adapting to new personTrips, refs #21 ........ fixing vtype output for jtrrouter, refs #21 ........ documenting external code at http://sumo.dlr.de/wiki/License, fix #2134 ........ added license reference, refs #2134 ........ removing txt file from Makefile, refs #3 ........ adapting test resulte, refs #21 ........ happy new year, refs #22 ........ visualizing absolute accumulated waiting time rather than percentages. refs #999, refs #36 ........ meso is no longer a separate binary ........ fixed vehicle coloring regression ........ fixed regression that was causing gui-freeze due to invalid mutex retention ........ happy new year leftover, refs #22 ........ fixed several memory leaks exposed by sanity checks with clang++-3.6, refs #12 ........ added test refs #2244 ........ added failing test refs #2246 ........ re-adding eclipse-project settings (deleted by mistake in r20447) ........ relocating test case, patching expected results refs #2246 ........ fix #2246 ........ trimming line for platform independence, refs #21, #22 ........ improving efficiency (amends [20452]) refs #12 ........ sane line endings for phemlight, refs #22 ........ git-svn-id: file:///home/behr_mi/git/sumo_synched/branches/pablo@20473 afbd958f-9f77-42d5-a016-97a22340ccf4
- Loading branch information
1 parent
ef65ca5
commit 6ba0eb1
Showing
1,922 changed files
with
44,279 additions
and
36,602 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?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.toolchain.gnu.base.829752678"> | ||
| <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.829752678" moduleId="org.eclipse.cdt.core.settings" name="Default"> | ||
| <externalSettings/> | ||
| <extensions> | ||
| <extension id="org.eclipse.cdt.core.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"/> | ||
| </extensions> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.829752678" name="Default" parent="org.eclipse.cdt.build.core.emptycfg"> | ||
| <folderInfo id="cdt.managedbuild.toolchain.gnu.base.829752678.1798086297" name="/" resourcePath=""> | ||
| <toolChain id="cdt.managedbuild.toolchain.gnu.base.368572183" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base"> | ||
| <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1736522779" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> | ||
| <builder buildPath="${workspace_loc:/SUMO-UrMo}" id="cdt.managedbuild.target.gnu.builder.base.998393894" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="4" superClass="cdt.managedbuild.target.gnu.builder.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.archiver.base.401787641" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.547302882" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"> | ||
| <option id="gnu.cpp.compiler.option.include.paths.1443828172" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${workspace_loc:/SUMO-UrMo/src}""/> | ||
| <listOptionValue builtIn="false" value="/usr/include/fox-1.6"/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1012282260" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> | ||
| </tool> | ||
| <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.609695075" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"> | ||
| <option id="gnu.c.compiler.option.include.paths.1493797458" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${workspace_loc:/SUMO-UrMo/src}""/> | ||
| <listOptionValue builtIn="false" value="/usr/include/fox-1.6"/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.66568957" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> | ||
| </tool> | ||
| <tool id="cdt.managedbuild.tool.gnu.c.linker.base.872645841" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1438287062" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"> | ||
| <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.621210093" 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.base.302953947" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"> | ||
| <option id="gnu.both.asm.option.include.paths.111258645" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${workspace_loc:/SUMO-UrMo/src}""/> | ||
| <listOptionValue builtIn="false" value="/usr/include/fox-1.6"/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1820603072" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> | ||
| </tool> | ||
| </toolChain> | ||
| </folderInfo> | ||
| </configuration> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> | ||
| </cconfiguration> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <project id="SUMO-UrMo.null.1255083003" name="SUMO-UrMo"/> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> | ||
| <storageModule moduleId="refreshScope" versionNumber="2"> | ||
| <configuration configurationName="Default"> | ||
| <resource resourceType="PROJECT" workspacePath="/SUMO-UrMo"/> | ||
| </configuration> | ||
| </storageModule> | ||
| <storageModule moduleId="scannerConfiguration"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.829752678;cdt.managedbuild.toolchain.gnu.base.829752678.1798086297;cdt.managedbuild.tool.gnu.cpp.compiler.base.547302882;cdt.managedbuild.tool.gnu.cpp.compiler.input.1012282260"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.829752678;cdt.managedbuild.toolchain.gnu.base.829752678.1798086297;cdt.managedbuild.tool.gnu.c.compiler.base.609695075;cdt.managedbuild.tool.gnu.c.compiler.input.66568957"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> | ||
| </cproject> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>SUMO-UrMo</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> | ||
| <triggers>clean,full,incremental,</triggers> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> | ||
| <triggers>full,incremental,</triggers> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.cdt.core.cnature</nature> | ||
| <nature>org.eclipse.cdt.core.ccnature</nature> | ||
| <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> | ||
| <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <project> | ||
| <configuration id="cdt.managedbuild.toolchain.gnu.base.829752678" name="Default"> | ||
| <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 class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/> | ||
| <provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" ref="shared-provider"/> | ||
| <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> | ||
| </extension> | ||
| </configuration> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.