bradybod-usu/robot_intelligence_final_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backup

Browse Source 
Working through some localization stuff will probably be pretty fluid.
This commit is contained in:
Brady Bodily
2020-12-14 16:08:59 -07:00
parent 2c5f0b73b9
commit d63066c150
19 changed files with 199 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/.idea.RobotIntelFinal/.idea/contentModel.xml generated
View File

@@ -14,23 +14,20 @@
<e p="IVehicle.cs" t="Include" />
<e p="JsonDeserializor.cs" t="Include" />
<e p="Maps" t="Include">
<e p="Cell.cs" t="Include" />
<e p="Direction.cs" t="Include" />
<e p="Heading.cs" t="Include" />
<e p="HexCell.cs" t="Include" />
<e p="HexMap.cs" t="Include" />
<e p="ICell.cs" t="Include" />
<e p="IHexCell.cs" t="Include" />
<e p="IHexMap.cs" t="Include" />
<e p="IMap.cs" t="Include" />
<e p="IMapFactory.cs" t="Include" />
<e p="ISquareCell.cs" t="Include" />
<e p="ISquareMap.cs" t="Include" />
<e p="MapFactory.cs" t="Include" />
<e p="SquareCell.cs" t="Include" />
<e p="SquareMap.cs" t="Include" />
</e>
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="Release" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="ConsoleApp.AssemblyInfo.cs" t="Include" />
</e>
@@ -46,7 +43,7 @@
<e p="packages" t="ExcludeRecursive" />
<e p="RobotIntelFinal.sln" t="IncludeFlat" />
</e>
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.2/extResources" t="IncludeRecursive" />
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.2/resharper-host/local/Transient/Rider/v202/SolutionCaches/_RobotIntelFinal.-1349721189.00" t="ExcludeRecursive" />
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.3/extResources" t="IncludeRecursive" />
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.3/resharper-host/local/Transient/Rider/v203/SolutionCaches/_RobotIntelFinal.-1349721189.00" t="ExcludeRecursive" />
</component>
</project>

2
.idea/.idea.RobotIntelFinal/.idea/modules.xml generated
View File

@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/riderModule.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/riderModule.iml" />
</modules>
</component>
</project>

205
.idea/.idea.RobotIntelFinal/.idea/workspace.xml generated
View File

@@ -4,6 +4,9 @@
<projectFile>Simulator/Simulator.csproj</projectFile>
<projectFile>ConsoleApp/ConsoleApp.csproj</projectFile>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="BranchesTreeState">
<expand>
<path>
@@ -15,17 +18,24 @@
</component>
<component name="ChangeListManager">
<list default="true" id="dafcaeb7-80aa-43a3-a480-786fafb78c0b" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/ConsoleApp/IJsonDeserializor.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ConsoleApp/IVehicle.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ConsoleApp/JsonDeserializor.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ConsoleApp/Vehicle.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ConsoleApp/VehicleConfiguration.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ConsoleApp/VehicleConfiguration.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/ConsoleApp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/ConsoleApp.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/IVehicle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/IVehicle.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/Heading.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/Heading.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/HexCell.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/HexMap.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/HexMap.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/IHexCell.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/IMap.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IMap.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/ISquareCell.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/SquareCell.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/Cell.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/SquareMap.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/SquareMap.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ConsoleApp/Vehicle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Vehicle.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/RobotIntelFinal.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/RobotIntelFinal.sln.DotSettings.user" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -42,54 +52,13 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/8B2EA1A3-95EB-49F7-AF97-CA55CE776F10/4/Container.cs" root0="SKIP_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Simulator/Program.cs" />
<option value="$PROJECT_DIR$/Simulator/CoreModule.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/IModule.cs" />
<option value="$PROJECT_DIR$/Simulator/SimulatorModule.cs" />
<option value="$PROJECT_DIR$/Simulator/NetworkInterfaceFactory.cs" />
<option value="$PROJECT_DIR$/Simulator/INetworkInterfaceFactory.cs" />
<option value="$PROJECT_DIR$/Simulator/NetworkInterface.cs" />
<option value="$PROJECT_DIR$/Simulator/Networking/NetworkInterfaceFactory.cs" />
<option value="$PROJECT_DIR$/Simulator/Networking/INetworkInterfaceFactory.cs" />
<option value="$PROJECT_DIR$/Simulator/Networking/INetworkInterface.cs" />
<option value="$PROJECT_DIR$/Simulator/Networking/NetworkInterface.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/IUserConsole.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Module.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/MapFactory.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/IMapFactory.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Bootstrapper.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/ISimRunner.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/UserConsole.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Program.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/IMapManager.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/Direction.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/Heading.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/IHexCell.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/MapManager.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/ISquareMap.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/IHexMap.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/IMap.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/ICell.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/SquareMap.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/SquareCell.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/HexCell.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/ISquareCell.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Maps/HexMap.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/VehicleConfiguration.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/JsonDeserializor.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/IJsonDeserializor.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/Vehicle.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/IVehicle.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" />
<option value="$PROJECT_DIR$/ConsoleApp/VehicleConfiguration.json" />
</list>
</option>
<changedPaths>
<option value="$PROJECT_DIR$/ConsoleApp/Maps/Heading.cs" />
</changedPaths>
</component>
<component name="ProjectId" id="1lIZ7IfsUjzqV2Jb1obOFvGFAfp" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -101,7 +70,7 @@
</component>
<component name="PropertiesComponent">
<property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.3496007" />
<property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.29991126" />
<property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.0" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="nodejs_package_manager_path" value="npm" />
@@ -157,7 +126,10 @@
<workItem from="1607286402206" duration="6845000" />
<workItem from="1607640133651" duration="318000" />
<workItem from="1607640470920" duration="58000" />
<workItem from="1607640550443" duration="11201000" />
<workItem from="1607640550443" duration="19992000" />
<workItem from="1607982179018" duration="634000" />
<workItem from="1607983288378" duration="86000" />
<workItem from="1607983862958" duration="1794000" />
</task>
<servers />
</component>
@@ -181,125 +153,4 @@
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
<component name="WindowStateProjectService">
<state width="1158" height="563" key="GridCell.Tab.0.bottom" timestamp="1607658943689">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="581" key="GridCell.Tab.0.bottom/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641515103" />
<state width="1158" height="563" key="GridCell.Tab.0.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657415855" />
<state width="1158" height="581" key="GridCell.Tab.0.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641379864" />
<state width="1158" height="563" key="GridCell.Tab.0.bottom/0.25.1440.875/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607658943689" />
<state width="1158" height="563" key="GridCell.Tab.0.center" timestamp="1607658943688">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="581" key="GridCell.Tab.0.center/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641515101" />
<state width="1158" height="563" key="GridCell.Tab.0.center/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657415853" />
<state width="1158" height="581" key="GridCell.Tab.0.center/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641379862" />
<state width="1158" height="563" key="GridCell.Tab.0.center/0.25.1440.875/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607658943688" />
<state width="1158" height="563" key="GridCell.Tab.0.left" timestamp="1607658943687">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="581" key="GridCell.Tab.0.left/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641515100" />
<state width="1158" height="563" key="GridCell.Tab.0.left/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657415853" />
<state width="1158" height="581" key="GridCell.Tab.0.left/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641379861" />
<state width="1158" height="563" key="GridCell.Tab.0.left/0.25.1440.875/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607658943687" />
<state width="1158" height="563" key="GridCell.Tab.0.right" timestamp="1607658943688">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="581" key="GridCell.Tab.0.right/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641515102" />
<state width="1158" height="563" key="GridCell.Tab.0.right/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657415854" />
<state width="1158" height="581" key="GridCell.Tab.0.right/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607641379863" />
<state width="1158" height="563" key="GridCell.Tab.0.right/0.25.1440.875/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607658943688" />
<state width="1158" height="716" key="GridCell.Tab.1.bottom" timestamp="1607657084436">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.1.bottom/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745266" />
<state width="1158" height="716" key="GridCell.Tab.1.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084436" />
<state width="1158" height="738" key="GridCell.Tab.1.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704043" />
<state width="1158" height="716" key="GridCell.Tab.1.center" timestamp="1607657084434">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.1.center/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745263" />
<state width="1158" height="716" key="GridCell.Tab.1.center/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084434" />
<state width="1158" height="738" key="GridCell.Tab.1.center/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704040" />
<state width="1158" height="716" key="GridCell.Tab.1.left" timestamp="1607657084433">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.1.left/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745262" />
<state width="1158" height="716" key="GridCell.Tab.1.left/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084433" />
<state width="1158" height="738" key="GridCell.Tab.1.left/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704038" />
<state width="1158" height="716" key="GridCell.Tab.1.right" timestamp="1607657084435">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.1.right/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745264" />
<state width="1158" height="716" key="GridCell.Tab.1.right/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084435" />
<state width="1158" height="738" key="GridCell.Tab.1.right/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704041" />
<state width="1158" height="716" key="GridCell.Tab.2.bottom" timestamp="1607657084438">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.2.bottom/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745280" />
<state width="1158" height="716" key="GridCell.Tab.2.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084438" />
<state width="1158" height="738" key="GridCell.Tab.2.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704050" />
<state width="1158" height="716" key="GridCell.Tab.2.center" timestamp="1607657084437">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.2.center/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745275" />
<state width="1158" height="716" key="GridCell.Tab.2.center/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084437" />
<state width="1158" height="738" key="GridCell.Tab.2.center/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704048" />
<state width="1158" height="716" key="GridCell.Tab.2.left" timestamp="1607657084437">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.2.left/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745274" />
<state width="1158" height="716" key="GridCell.Tab.2.left/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084437" />
<state width="1158" height="738" key="GridCell.Tab.2.left/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704046" />
<state width="1158" height="716" key="GridCell.Tab.2.right" timestamp="1607657084438">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.2.right/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745277" />
<state width="1158" height="716" key="GridCell.Tab.2.right/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084438" />
<state width="1158" height="738" key="GridCell.Tab.2.right/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704049" />
<state width="1158" height="716" key="GridCell.Tab.3.bottom" timestamp="1607657084440">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.3.bottom/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745288" />
<state width="1158" height="716" key="GridCell.Tab.3.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084440" />
<state width="1158" height="738" key="GridCell.Tab.3.bottom/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704055" />
<state width="1158" height="716" key="GridCell.Tab.3.center" timestamp="1607657084439">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.3.center/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745286" />
<state width="1158" height="716" key="GridCell.Tab.3.center/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084439" />
<state width="1158" height="738" key="GridCell.Tab.3.center/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704053" />
<state width="1158" height="716" key="GridCell.Tab.3.left" timestamp="1607657084439">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.3.left/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745282" />
<state width="1158" height="716" key="GridCell.Tab.3.left/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084439" />
<state width="1158" height="738" key="GridCell.Tab.3.left/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704052" />
<state width="1158" height="716" key="GridCell.Tab.3.right" timestamp="1607657084440">
<screen x="1440" y="-757" width="1200" height="1895" />
</state>
<state width="1158" height="738" key="GridCell.Tab.3.right/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640745287" />
<state width="1158" height="716" key="GridCell.Tab.3.right/0.25.1440.798/2640.-757.1200.1895/1440.-757.1200.1895@1440.-757.1200.1895" timestamp="1607657084440" />
<state width="1158" height="738" key="GridCell.Tab.3.right/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640704054" />
<state x="1640" y="-86" key="Rider.ProjectTemplateDialog.Size" timestamp="1607640243485">
<screen x="1440" y="-782" width="1200" height="1920" />
</state>
<state x="1640" y="-86" key="Rider.ProjectTemplateDialog.Size/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607286605974" />
<state x="1640" y="-86" key="Rider.ProjectTemplateDialog.Size/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640243485" />
<state x="1860" y="-144" key="RiderGenerateDialog" timestamp="1607636510472">
<screen x="1440" y="-782" width="1200" height="1920" />
</state>
<state x="1860" y="-144" key="RiderGenerateDialog/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607636510472" />
<state x="1549" y="-186" key="SettingsEditor" timestamp="1607640461977">
<screen x="1440" y="-782" width="1200" height="1920" />
</state>
<state x="1549" y="-186" key="SettingsEditor/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640461977" />
<state x="1549" y="-186" key="SettingsEditor/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607640274923" />
<state x="1549" y="-186" key="SettingsEditor/0.25.1440.875/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607639999828" />
<state x="1703" y="-333" width="672" height="678" key="search.everywhere.popup" timestamp="1607633696072">
<screen x="1440" y="-782" width="1200" height="1920" />
</state>
<state x="1703" y="-333" width="672" height="678" key="search.everywhere.popup/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607633696072" />
</component>
</project>

8
ConsoleApp/ConsoleApp.csproj
View File

@@ -5,6 +5,14 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DryIoc.dll" Version="4.5.2" />
</ItemGroup>

9
ConsoleApp/IVehicle.cs
View File

@@ -1,9 +1,16 @@
using ConsoleApp.Maps;
namespace ConsoleApp
{
public interface IVehicle
{
int Length { get; }
int Width { get; }
int DetectorWidth { get; }
int DetectorOffset { get;}
int DetectorWidth { get;}
ICell CurrentHexCell { get; set; }
Heading HexHeading { get; set; }
Heading SquareHeading { get; set; }
ICell CurrentSquareCell { get; set; }
}
}

23
ConsoleApp/Maps/Cell.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
namespace ConsoleApp.Maps
{
public struct Cell : ICell
{
public int X { get; }
public int Y { get; }
public int Z { get; }
public Cell(int x, int y, int z = default)
{
if (z != default)
{
if (x + y + z != 0) throw new ArgumentException("x + y + z must be 0");
}
X = x;
Y = y;
Z = z;
}
}
}

32
ConsoleApp/Maps/Heading.cs
View File

@@ -1,35 +1,49 @@
using System.Net.NetworkInformation;
namespace ConsoleApp.Maps
{
public class Oreientation
{
public static (int, int) Forward = (0, 1);
public static (int, int) Backward = (0, -1);
public static (int, int) Left = (-1, 0);
public static (int, int) Right = (1, 0);
public static (int, int) LeftBack = (-1, -1);
public static (int, int) LeftForward = (-1, 1);
public static (int, int) RightBack = (1, -1);
public static (int, int) RightForward = (1, 1);
}
public class Heading
{
private (int, int) _currentHeading;
public (int, int) CurrentHeading { get; }
public void SetHeading((int,int)frontAxel, (int,int)backAxel)
{
var x = frontAxel.Item1 - backAxel.Item1;
var y = frontAxel.Item2 - backAxel.Item2;
//forward
if (x == 0 && y >= 1) _currentHeading = (0, 1);
if (x == 0 && y >= 1) _currentHeading = Oreientation.Forward;
//backward
if (x == 0 && y <= -1) _currentHeading = (0, -1);
if (x == 0 && y <= -1) _currentHeading = Oreientation.Backward;
//right
if (x >= 1 && y == 0) _currentHeading = (1, 0);
if (x >= 1 && y == 0) _currentHeading = Oreientation.Right;
//left
if (x <= -1 && y == 0) _currentHeading = (-1, 0);
if (x <= -1 && y == 0) _currentHeading = Oreientation.Left;
//left, back
if (x <= -1 && y <= -1) _currentHeading = (-1, -1);
if (x <= -1 && y <= -1) _currentHeading = Oreientation.LeftBack;
//right, forward
if (x >= 1 && y >= 1) _currentHeading = (1, 1);
if (x >= 1 && y >= 1) _currentHeading = Oreientation.RightForward;
//left, forward
if (x <= -1 && y >= 1) _currentHeading = (-1, 1);
if (x <= -1 && y >= 1) _currentHeading = Oreientation.LeftForward;
//right, back
if (x >= 1 && y <= -1) _currentHeading = (1, -1);
if (x >= 1 && y <= -1) _currentHeading = Oreientation.RightBack;
}
public Heading()
{
_currentHeading = (1,0);
_currentHeading = Oreientation.Forward;
CurrentHeading = _currentHeading;
}

20
ConsoleApp/Maps/HexCell.cs
View File

@@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
namespace ConsoleApp.Maps
{
public struct HexCell : IHexCell
{
public int X { get; }
public int Y { get; }
public int Z { get; }
public HexCell(int q, int r, int s)
{
if (q + r + s != 0) throw new ArgumentException("q + r + s must be 0");
X = q;
Y = r;
Z = s;
}
}
}

26
ConsoleApp/Maps/HexMap.cs
View File

@@ -5,16 +5,32 @@ namespace ConsoleApp.Maps
{
public class HexMap : IHexMap
{
private HexCell[,] Map { get; }
public Cell[,] Map { get; }
public ICell StartingCell { get; }
public ICell LastCell { get; }
/// <summary>
/// Generate Hex map with cells of 25cm X 25cm
/// </summary>
/// <param name="x"></param>
/// <param name="y"></param>
public HexMap(int x, int y)
{
Map = new HexCell[x+1,y+1];
for (int r = 0; r < y; r++) {
//convert to cm
x *= 100;
y *= 100;
//calculate number of cells on x and y axis
var xCellCount = (int)Math.Ceiling((decimal) (x) / 25);
var yCellCount = (int)Math.Ceiling((decimal) (y) / 25);
//set last cell;
StartingCell = Map[0, 0];
Map = new Cell[xCellCount, yCellCount];
for (int r = 0; r < yCellCount; r++) {
int r_offset = Convert.ToInt32(Math.Floor(Convert.ToDouble(r)/2));
for (int q = r_offset; q < x - r_offset; q++) {
for (int q = r_offset; q < xCellCount - r_offset; q++) {
// Console.WriteLine($"r:{r}, q:{q}-----x:{x}, y:{y}");
Map[r, q] = new HexCell(q, r, -q-r);
Map[r, q] = new Cell(q, r, -q-r);
}
}
}

7
ConsoleApp/Maps/IHexCell.cs
View File

@@ -1,7 +0,0 @@
namespace ConsoleApp.Maps
{
public interface IHexCell : ICell
{
}
}

4
ConsoleApp/Maps/IMap.cs
View File

@@ -1,9 +1,13 @@
using System.Collections.Generic;
using System.ComponentModel;
namespace ConsoleApp.Maps
{
public interface IMap
{
public Cell[,] Map { get; }
ICell StartingCell { get; }
ICell LastCell { get; }
public List<ICell> PossibleMoves(ICell currentCell);
}
}

1
ConsoleApp/Maps/IMapFactory.cs
View File

@@ -7,6 +7,7 @@ namespace ConsoleApp.Maps
{
int Height { get; }
int Width { get; }
int CellWidth { get; }
Dictionary<string, IMap> Maps { get; }
void GenerateMaps(int x, int y);
}

8
ConsoleApp/Maps/ISquareCell.cs
View File

@@ -1,8 +0,0 @@
namespace ConsoleApp.Maps
{
public interface ISquareCell : ICell
{
new int X { get; }
new int Y { get; }
}
}

4
ConsoleApp/Maps/MapFactory.cs
View File

@@ -8,6 +8,7 @@ namespace ConsoleApp.Maps
private int _defaultWidth;
public int Height { get; protected set; }
public int Width { get; protected set; }
public int CellWidth { get; protected set; }
public Dictionary<string, IMap> Maps { get; }
@@ -20,8 +21,9 @@ namespace ConsoleApp.Maps
Maps.Add("HexMap", new HexMap(x, y));
}
public MapFactory()
public MapFactory(IVehicle vehicle)
{
CellWidth = vehicle.Width/2;
_defaultHeight = 0;
_defaultWidth = 0;
Height = _defaultHeight;

16
ConsoleApp/Maps/SquareCell.cs
View File

@@ -1,16 +0,0 @@
namespace ConsoleApp.Maps
{
public struct SquareCell : ISquareCell
{
public int X { get; }
public int Y { get; }
public int Z { get; }
public SquareCell(int x, int y)
{
X = x;
Y = y;
Z = default;
}
}
}

17
ConsoleApp/Maps/SquareMap.cs
View File

@@ -5,16 +5,27 @@ namespace ConsoleApp.Maps
{
public class SquareMap : ISquareMap
{
public SquareCell[,] Map { get;}
public Cell[,] Map { get;}
public ICell StartingCell { get; }
public ICell LastCell { get; }
public SquareMap(int x, int y)
{
Map = new SquareCell[x,y];
//convert to cm
x *= 100;
y *= 100;
//calculate number of cells on x and y axis
var xCellCount = (int)Math.Ceiling((decimal) (x) / 25);
var yCellCount = (int)Math.Ceiling((decimal) (y) / 25);
//set last cell;
StartingCell = Map[0, 0];
Map = new Cell[xCellCount, yCellCount];
for (int i = 0; i < x; i++)
{
for (int j = 0; j < y; j++)
{
Map[i,j] = new SquareCell(i, j);
Map[i,j] = new Cell(i, j);
}
}
}

48
ConsoleApp/SimRunner.cs
View File

@@ -1,3 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using ConsoleApp.Maps;
namespace ConsoleApp
@@ -5,15 +9,59 @@ namespace ConsoleApp
public class SimRunner : ISimRunner
{
private IMapFactory _mapFactory;
private IVehicle _vehicle;
private IMap _squareMap;
private IMap _hexMap;
private int _cellWidth;
public SimRunner(IMapFactory mapFactory, IVehicle vehicle)
{
_squareMap = mapFactory.Maps["SquareMap"];
_hexMap = mapFactory.Maps["HexMap"];
_cellWidth = mapFactory.CellWidth;
_mapFactory = mapFactory;
_vehicle = vehicle;
}
public void Run()
{
_vehicle.CurrentHexCell = _hexMap.StartingCell;
_vehicle.CurrentSquareCell = _squareMap.StartingCell;
var squareTask = Task.Run(() => SquareSimulation());
var hexTask = Task.Run(() => HexSimulation());
while(!squareTask.IsCompleted && !hexTask.IsCompleted){Thread.Sleep(500);}
}
private void HexSimulation()
{
var optimalPath = GenerateHexPath();
}
private void SquareSimulation()
{
var optimalPath = GenerateSquarePath();
}
private object GenerateSquarePath()
{
throw new NotImplementedException();
}
private Queue<ICell> GenerateHexPath()
{
var path = new Queue<ICell>();
var currentCell = _vehicle.CurrentHexCell;
var possibles = _hexMap.PossibleMoves(currentCell);
while (currentCell != _hexMap.LastCell)
{
}
return path;
}
}
}

13
ConsoleApp/Vehicle.cs
View File

@@ -1,4 +1,5 @@
using System;
using ConsoleApp.Maps;
namespace ConsoleApp
{
@@ -9,6 +10,12 @@ namespace ConsoleApp
public int DetectorOffset { get;}
public int DetectorWidth { get;}
public ICell CurrentHexCell { get; set; }
public Heading HexHeading { get; set; }
public Heading SquareHeading { get; set; }
public ICell CurrentSquareCell { get; set; }
public Vehicle(IJsonDeserializor jsonDeserializor)
{
@@ -17,8 +24,10 @@ namespace ConsoleApp
Width = config.Width;
DetectorWidth = config.DetectorWidth;
DetectorOffset = config.DetectorOffset;
CurrentHexCell = default;
CurrentSquareCell = default;
HexHeading = default;
SquareHeading = default;
}
}
}

3
RobotIntelFinal.sln.DotSettings.user
View File

@@ -1,3 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Int64 x:Key="/Default/Environment/Hierarchy/Build/BuildTool/MsbuildVersion/@EntryValue">1048576</s:Int64>
<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/DotNetCliExePath/@EntryValue">/Users/brady.bodily/.dotnet/dotnet</s:String>
<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">/Users/brady.bodily/.dotnet/sdk/3.1.402/MSBuild.dll</s:String></wpf:ResourceDictionary>