chris/TrafficSim
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'master' of https://git.skalarprodukt.de/chris/TrafficSim

Browse Source
This commit is contained in:
Christian Loch 2020-11-15 16:30:51 +01:00
commit 7d5be6ee31
2 changed files with 45 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/Benutzerhandbuch.docx
View File

Binary file not shown.

199
doc/classdiagram.graphml
View File

@ -28,6 +28,7 @@
# maxVelocity: float
# brakeProb: float
# id: int
# test: int
# trackLength: float</y:AttributeLabel>
<y:MethodLabel xml:space="preserve">+ timeElapse(): void
- getPosition(): float
@ -91,34 +92,30 @@
</node>
<node id="n3">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:UMLClassNode>
<y:Geometry height="165.81767180925672" width="378.11827956989254" x="-347.7597373188404" y="31.442145862552735"/>
<y:Geometry height="100.0" width="378.11827956989254" x="-347.7597373188404" y="31.442145862552735"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="108.75537109375" x="134.68145423807127" xml:space="preserve" y="3.0">TimeRecordView<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:UML clipContent="true" constraint="" hasDetailsColor="false" omitDetails="false" stereotype="" use3DEffect="true">
<y:AttributeLabel xml:space="preserve"># paint: Paint
# track: Track
# pixelPerVehicle: int</y:AttributeLabel>
<y:MethodLabel xml:space="preserve"># getColor(curVelocity: float, maxVelocity: float): int
# onMeasure(widthMeasureSpec: int, heightMeasureSpec: int): void
# onSizeChanged(w: int, h: int, oldw: int, oldh: int): void
# onDraw(canvas: Canvas): void</y:MethodLabel>
<y:AttributeLabel xml:space="preserve"/>
<y:MethodLabel xml:space="preserve"># onSizeChanged(w: int, h: int, oldw: int, oldh: int): void
- TimeRecordView(context: context, track: Track)
</y:MethodLabel>
</y:UML>
</y:UMLClassNode>
</data>
</node>
<node id="n4">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:UMLClassNode>
<y:Geometry height="28.0" width="100.0" x="-208.7005975338941" y="-160.9167031907433"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="33.62451171875" x="33.187744140625" xml:space="preserve" y="3.0">View<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="81.314453125" x="9.3427734375" xml:space="preserve" y="3.0">SurfaveView<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:UML clipContent="true" constraint="" hasDetailsColor="false" omitDetails="false" stereotype="" use3DEffect="true">
<y:AttributeLabel xml:space="preserve"/>
<y:MethodLabel xml:space="preserve"/>
@ -128,46 +125,68 @@
</node>
<node id="n5">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:UMLClassNode>
<y:Geometry height="208.0068592215987" width="283.97265077138866" x="-417.2893072113136" y="243.66936579593266"/>
<y:Geometry height="376.2424833450209" width="269.12833099579257" x="-417.2893072113136" y="243.66936579593266"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="80.57177734375" x="101.70043671381933" xml:space="preserve" y="3.0">MainActivity<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="80.57177734375" x="94.27827682602128" xml:space="preserve" y="3.0">MainActivity<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:UML clipContent="true" constraint="" hasDetailsColor="false" omitDetails="false" stereotype="" use3DEffect="true">
<y:AttributeLabel xml:space="preserve"># track: Track
# trackView: TimeRecordView
# worker: Worker
# viewStack: LinearLayout</y:AttributeLabel>
<y:AttributeLabel xml:space="preserve"> -static defaultNoOfVehicles: int = 25 {readOnly}
- static defaultTrackLength: int = 100 {readOnly}
- static defaultBrakeProb: float = 0.3f {readOnly}
- static defaultMaxVelocity: float = 5.0f {readOnly}
- static defaultDelay: int = 0 {readOnly}
- static defaultHistoryLength: int = 50 {readOnly}
- static defaultFrameskip: int = 0 {readOnly}
# Track track: Track
# TimeRecordView trackView: TimeRecordView
# Worker worker: Worker
# Renderer renderer: Renderer
# LinearLayout viewStack: LinearLayout</y:AttributeLabel>
<y:MethodLabel xml:space="preserve"># onCreate(savedInstanceState:Bundle): void
- update(observable: Observable, o: Object): void
- static round(float number, int digits): float
# stopWorker(): void
# updateTrack(): void
- onProgressChanged(seekBar: SeekBar, progress: int, fromUser; boolean): void
- onStartTrackingTouch(seekBar: SeekBar): void
- onStopTrackingTouch(seekBar: SeekBar): void
- onStepButtonClick(view: View): void
- onPlayButtonClick(view: View): void
- onStopButtonClick(view: View): void</y:MethodLabel>
- onStopButtonClick(view: View): void
- onClearButtonClick(view: View): void</y:MethodLabel>
</y:UML>
</y:UMLClassNode>
</data>
</node>
<node id="n6">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:UMLClassNode>
<y:Geometry height="28.0" width="100.0" x="646.3835539387567" y="116.33785501402525"/>
<y:Geometry height="87.37727910238425" width="100.0" x="646.3835539387567" y="116.33785501402525"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.7890625" x="25.60546875" xml:space="preserve" y="3.0">Worker<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:UML clipContent="true" constraint="" hasDetailsColor="false" omitDetails="false" stereotype="" use3DEffect="true">
<y:AttributeLabel xml:space="preserve"/>
<y:MethodLabel xml:space="preserve"/>
<y:AttributeLabel xml:space="preserve"># frameskip: int
# renderer: Renderer
# track: Track
# stop: boolean
# gui: MainActivity
# Renderer renderer
# int frameskip;</y:AttributeLabel>
<y:MethodLabel xml:space="preserve">- run(): void
- setStop(stop: boolean): void
- setFrameskip(frames): int: void
- Worker(track: track, gui: MainActivity, renderer: Renderer, frameskip: int)
</y:MethodLabel>
</y:UML>
</y:UMLClassNode>
</data>
</node>
<node id="n7">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:UMLClassNode>
<y:Geometry height="28.0" width="100.0" x="646.3835539387567" y="-73.49999999999989"/>
@ -181,35 +200,6 @@
</y:UMLClassNode>
</data>
</node>
<node id="n8">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:SVGNode>
<y:Geometry height="100.0" width="60.0" x="-120.14866760168297" y="469.8657082748948"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="34.341796875" x="12.8291015625" xml:space="preserve" y="104.0">Actor<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:SVGNodeProperties usingVisualBounds="false"/>
<y:SVGModel svgBoundsPolicy="0">
<y:SVGContent refid="1"/>
</y:SVGModel>
</y:SVGNode>
</data>
</node>
<node id="n9">
<data key="d4" xml:space="preserve"/>
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="50.0" width="110.0" x="-81.66514726507717" y="439.1556802244039"/>
<y:Fill color="#FFFFFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="19.92626953125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="58.93896484375" x="25.530517578125" xml:space="preserve" y="15.036865234375">Blaaaaaa<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
<y:Shape type="ellipse"/>
</y:ShapeNode>
</data>
</node>
<edge id="e0" source="n1" target="n0">
<data key="d8" xml:space="preserve"/>
<data key="d10">
@ -249,7 +239,6 @@
</data>
</edge>
<edge id="e3" source="n3" target="n4">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -260,7 +249,6 @@
</data>
</edge>
<edge id="e4" source="n6" target="n7">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -272,103 +260,6 @@
</edge>
</graph>
<data key="d7">
<y:Resources>
<y:Resource id="1" xml:space="preserve">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
&lt;svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="41"
height="68.997391"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docbase="C:\Daten\alberts\projects\yfx"
sodipodi:docname="uml_actor.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"&gt;
&lt;defs
id="defs4" /&gt;
&lt;sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.934351"
inkscape:cx="144.21983"
inkscape:cy="28.533711"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
width="48px"
height="48px"
showborder="false"
inkscape:showpageshadow="false" /&gt;
&lt;metadata
id="metadata7"&gt;
&lt;rdf:RDF&gt;
&lt;cc:Work
rdf:about=""&gt;
&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
&lt;dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
&lt;/cc:Work&gt;
&lt;/rdf:RDF&gt;
&lt;/metadata&gt;
&lt;g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-29.5,-42.959476)"&gt;
&lt;a
id="a3142"
transform="matrix(1.0873906,0,0,1,-4.4741999,0)"&gt;
&lt;path
transform="translate(11.586889,5.2908993)"
d="M 47.02914 47.36993 A 8.5197716 9.2013531 0 1 1 29.989597,47.36993 A 8.5197716 9.2013531 0 1 1 47.02914 47.36993 z"
sodipodi:ry="9.2013531"
sodipodi:rx="8.5197716"
sodipodi:cy="47.36993"
sodipodi:cx="38.509369"
id="path2160"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
sodipodi:type="arc" /&gt;
&lt;/a&gt;
&lt;path
sodipodi:type="arc"
style="fill:none"
id="path3134"
sodipodi:cx="43.962021"
sodipodi:cy="48.392303"
sodipodi:rx="3.7486994"
sodipodi:ry="0"
d="M 47.71072 48.392303 A 3.7486994 0 0 1 1 40.213321,48.392303 A 3.7486994 0 0 1 1 47.71072 48.392303 z" /&gt;
&lt;path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.24319649px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 50,61.33709 C 50,91.363211 50,92.247838 50,92.247838"
id="path3136" /&gt;
&lt;path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 69.760668,72.362183 C 69.760668,72.362183 69.760668,72.362183 50.239332,72.362183 C 30.239332,72.362183 30.239332,72.362183 30.239332,72.362183 L 30.239332,72.362183"
id="path3138" /&gt;
&lt;path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 30,111.45687 C 30,111.45687 30,111.45687 50,92.013532 C 70,111.45687 70,111.45687 70,111.45687"
id="path3140" /&gt;
&lt;/g&gt;
&lt;/svg&gt;
</y:Resource>
</y:Resources>
<y:Resources/>
</data>
</graphml>