Skip to content

Commit 53a39c1

Browse files
CatLearnedCatLearned
CatLearned
authored and
CatLearned
committed
Добавлена перезапись путей, добавлены интерфейсы для удаления станции и пути, а также для поиска пути. Исправлен ряд ошибок
1 parent a35719f commit 53a39c1

File tree

5 files changed

+460
-184
lines changed

5 files changed

+460
-184
lines changed

‎CourseProject.lps‎

Lines changed: 56 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
<PathDelim Value="\"/>
55
<Version Value="9"/>
66
<BuildModes Active="Default"/>
7-
<Units Count="11">
7+
<Units Count="7">
88
<Unit0>
99
<Filename Value="CourseProject.lpr"/>
1010
<IsPartOfProject Value="True"/>
11-
<WindowIndex Value="1"/>
12-
<CursorPos X="39" Y="10"/>
13-
<UsageCount Value="200"/>
11+
<UsageCount Value="28"/>
1412
</Unit0>
1513
<Unit1>
1614
<Filename Value="unit1.pas"/>
@@ -19,19 +17,15 @@
1917
<HasResources Value="True"/>
2018
<ResourceBaseClass Value="Form"/>
2119
<UnitName Value="Unit1"/>
22-
<<<<<<< HEAD
2320
<IsVisibleTab Value="True"/>
24-
<WindowIndex Value="1"/>
25-
<TopLine Value="165"/>
26-
<CursorPos X="85" Y="171"/>
27-
=======
28-
<WindowIndex Value="1"/>
29-
<TopLine Value="188"/>
30-
<CursorPos X="38" Y="145"/>
31-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
32-
<UsageCount Value="200"/>
33-
<Bookmarks Count="1">
34-
<Item0 X="4" Y="236" ID="3"/>
21+
<TopLine Value="296"/>
22+
<CursorPos X="17" Y="247"/>
23+
<UsageCount Value="28"/>
24+
<Bookmarks Count="4">
25+
<Item0 Y="309" ID="1"/>
26+
<Item1 Y="169" ID="2"/>
27+
<Item2 Y="96" ID="3"/>
28+
<Item3 Y="242" ID="9"/>
3529
</Bookmarks>
3630
<Loaded Value="True"/>
3731
<LoadedDesigner Value="True"/>
@@ -40,242 +34,161 @@
4034
<Filename Value="objectid.pas"/>
4135
<IsPartOfProject Value="True"/>
4236
<UnitName Value="ObjectID"/>
43-
<EditorIndex Value="1"/>
44-
<WindowIndex Value="1"/>
45-
<CursorPos X="9" Y="9"/>
46-
<<<<<<< HEAD
47-
<UsageCount Value="61"/>
48-
=======
49-
<UsageCount Value="60"/>
50-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
51-
<Loaded Value="True"/>
37+
<UsageCount Value="28"/>
5238
</Unit2>
5339
<Unit3>
5440
<Filename Value="station.pas"/>
5541
<IsPartOfProject Value="True"/>
5642
<UnitName Value="Station"/>
57-
<EditorIndex Value="2"/>
58-
<WindowIndex Value="1"/>
59-
<TopLine Value="35"/>
60-
<CursorPos Y="62"/>
61-
<<<<<<< HEAD
62-
<UsageCount Value="61"/>
63-
=======
64-
<UsageCount Value="60"/>
65-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
66-
<Bookmarks Count="1">
67-
<Item0 Y="6" ID="4"/>
68-
</Bookmarks>
43+
<EditorIndex Value="1"/>
44+
<CursorPos X="15" Y="93"/>
45+
<UsageCount Value="28"/>
6946
<Loaded Value="True"/>
7047
</Unit3>
7148
<Unit4>
7249
<Filename Value="way.pas"/>
7350
<IsPartOfProject Value="True"/>
7451
<UnitName Value="Way"/>
75-
<EditorIndex Value="3"/>
76-
<WindowIndex Value="1"/>
77-
<TopLine Value="37"/>
78-
<CursorPos Y="60"/>
79-
<<<<<<< HEAD
80-
<UsageCount Value="60"/>
81-
=======
82-
<UsageCount Value="59"/>
83-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
52+
<EditorIndex Value="2"/>
53+
<TopLine Value="31"/>
54+
<CursorPos X="55" Y="63"/>
55+
<UsageCount Value="28"/>
8456
<Loaded Value="True"/>
8557
</Unit4>
8658
<Unit5>
8759
<Filename Value="lists.pas"/>
8860
<IsPartOfProject Value="True"/>
8961
<UnitName Value="Lists"/>
90-
<EditorIndex Value="4"/>
91-
<WindowIndex Value="1"/>
92-
<CursorPos X="26" Y="19"/>
93-
<<<<<<< HEAD
94-
<UsageCount Value="58"/>
95-
=======
96-
<UsageCount Value="57"/>
97-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
98-
<Loaded Value="True"/>
62+
<UsageCount Value="28"/>
9963
</Unit5>
10064
<Unit6>
10165
<Filename Value="constantstypes.pas"/>
10266
<IsPartOfProject Value="True"/>
10367
<UnitName Value="ConstantsTypes"/>
104-
<EditorIndex Value="5"/>
105-
<WindowIndex Value="1"/>
106-
<CursorPos X="18" Y="13"/>
107-
<<<<<<< HEAD
108-
<UsageCount Value="52"/>
109-
=======
110-
<UsageCount Value="51"/>
111-
>>>>>>> d4252adc4765b446f38f8bed9245be2c1dd88363
112-
<Loaded Value="True"/>
68+
<UsageCount Value="28"/>
11369
</Unit6>
114-
<Unit7>
115-
<Filename Value="crossing.pas"/>
116-
<UnitName Value="Crossing"/>
117-
<WindowIndex Value="1"/>
118-
<TopLine Value="15"/>
119-
<CursorPos X="26" Y="16"/>
120-
<UsageCount Value="190"/>
121-
</Unit7>
122-
<Unit8>
123-
<Filename Value="subway.pas"/>
124-
<UnitName Value="SubWay"/>
125-
<WindowIndex Value="1"/>
126-
<CursorPos X="25" Y="13"/>
127-
<UsageCount Value="189"/>
128-
</Unit8>
129-
<Unit9>
130-
<Filename Value="stationlist.pas"/>
131-
<UnitName Value="StationList"/>
132-
<WindowIndex Value="1"/>
133-
<CursorPos X="5" Y="18"/>
134-
<UsageCount Value="19"/>
135-
</Unit9>
136-
<Unit10>
137-
<Filename Value="C:\lazarus\lcl\include\control.inc"/>
138-
<EditorIndex Value="-1"/>
139-
<WindowIndex Value="1"/>
140-
<TopLine Value="3244"/>
141-
<CursorPos Y="3267"/>
142-
<UsageCount Value="10"/>
143-
</Unit10>
14470
</Units>
14571
<JumpHistory Count="30" HistoryIndex="29">
14672
<Position1>
14773
<Filename Value="unit1.pas"/>
148-
<Caret Line="142" Column="56" TopLine="129"/>
74+
<Caret Line="119" Column="23" TopLine="102"/>
14975
</Position1>
15076
<Position2>
15177
<Filename Value="unit1.pas"/>
152-
<Caret Line="144" TopLine="129"/>
78+
<Caret Line="221" Column="29" TopLine="204"/>
15379
</Position2>
15480
<Position3>
15581
<Filename Value="unit1.pas"/>
156-
<Caret Line="144" TopLine="129"/>
82+
<Caret Line="226" Column="122" TopLine="209"/>
15783
</Position3>
15884
<Position4>
15985
<Filename Value="unit1.pas"/>
160-
<Caret Line="273" TopLine="250"/>
86+
<Caret Line="221" Column="11" TopLine="204"/>
16187
</Position4>
16288
<Position5>
16389
<Filename Value="unit1.pas"/>
164-
<Caret Line="280" Column="25" TopLine="250"/>
90+
<Caret Line="222" Column="11" TopLine="205"/>
16591
</Position5>
16692
<Position6>
16793
<Filename Value="unit1.pas"/>
168-
<Caret Line="282" TopLine="250"/>
94+
<Caret Line="223" Column="11" TopLine="206"/>
16995
</Position6>
17096
<Position7>
171-
<Filename Value="station.pas"/>
172-
<Caret Line="61" TopLine="35"/>
97+
<Filename Value="unit1.pas"/>
98+
<Caret Line="224" Column="11" TopLine="207"/>
17399
</Position7>
174100
<Position8>
175-
<Filename Value="station.pas"/>
176-
<Caret Line="62" TopLine="35"/>
101+
<Filename Value="unit1.pas"/>
102+
<Caret Line="225" Column="11" TopLine="208"/>
177103
</Position8>
178104
<Position9>
179105
<Filename Value="unit1.pas"/>
180-
<Caret Line="114" Column="44" TopLine="114"/>
106+
<Caret Line="146" TopLine="124"/>
181107
</Position9>
182108
<Position10>
183109
<Filename Value="unit1.pas"/>
184-
<Caret Line="271" Column="27" TopLine="260"/>
110+
<Caret Line="174" Column="32" TopLine="140"/>
185111
</Position10>
186112
<Position11>
187113
<Filename Value="unit1.pas"/>
188-
<Caret Line="278" Column="42" TopLine="260"/>
114+
<Caret Line="262" Column="103" TopLine="270"/>
189115
</Position11>
190116
<Position12>
191117
<Filename Value="unit1.pas"/>
192-
<Caret Line="61" Column="24" TopLine="39"/>
118+
<Caret Line="261" Column="34" TopLine="243"/>
193119
</Position12>
194120
<Position13>
195121
<Filename Value="unit1.pas"/>
196-
<Caret Line="141" Column="22" TopLine="111"/>
122+
<Caret Line="264" Column="54" TopLine="250"/>
197123
</Position13>
198124
<Position14>
199-
<Filename Value="unit1.pas"/>
200-
<Caret Line="271" Column="38" TopLine="126"/>
125+
<Filename Value="station.pas"/>
126+
<Caret Line="93" Column="18" TopLine="46"/>
201127
</Position14>
202128
<Position15>
203-
<Filename Value="unit1.pas"/>
204-
<Caret Line="278" Column="45" TopLine="254"/>
129+
<Filename Value="station.pas"/>
130+
<Caret Line="84" Column="19" TopLine="48"/>
205131
</Position15>
206132
<Position16>
207-
<Filename Value="unit1.pas"/>
208-
<Caret Line="271" Column="27" TopLine="253"/>
133+
<Filename Value="station.pas"/>
134+
<Caret Line="79" Column="18" TopLine="48"/>
209135
</Position16>
210136
<Position17>
211-
<Filename Value="unit1.pas"/>
212-
<Caret Line="278" Column="42" TopLine="253"/>
137+
<Filename Value="station.pas"/>
138+
<Caret Line="13" Column="26"/>
213139
</Position17>
214140
<Position18>
215141
<Filename Value="unit1.pas"/>
216-
<Caret Line="61" Column="24" TopLine="39"/>
142+
<Caret Line="137" Column="36" TopLine="109"/>
217143
</Position18>
218144
<Position19>
219145
<Filename Value="unit1.pas"/>
220-
<Caret Line="141" Column="54" TopLine="114"/>
146+
<Caret Line="138" Column="36" TopLine="110"/>
221147
</Position19>
222148
<Position20>
223149
<Filename Value="unit1.pas"/>
224-
<Caret Line="142" Column="50" TopLine="118"/>
150+
<Caret Line="140" Column="36" TopLine="112"/>
225151
</Position20>
226152
<Position21>
227153
<Filename Value="unit1.pas"/>
228-
<Caret Line="61" Column="40" TopLine="32"/>
154+
<Caret Line="367" Column="3" TopLine="359"/>
229155
</Position21>
230156
<Position22>
231157
<Filename Value="unit1.pas"/>
232-
<Caret Line="271" Column="27" TopLine="260"/>
158+
<Caret Line="368" Column="3" TopLine="360"/>
233159
</Position22>
234160
<Position23>
235161
<Filename Value="unit1.pas"/>
236-
<Caret Line="278" Column="42" TopLine="260"/>
162+
<Caret Line="369" Column="3" TopLine="361"/>
237163
</Position23>
238164
<Position24>
239165
<Filename Value="unit1.pas"/>
240-
<Caret Line="61" Column="24" TopLine="39"/>
166+
<Caret Line="370" Column="3" TopLine="362"/>
241167
</Position24>
242168
<Position25>
243169
<Filename Value="unit1.pas"/>
244-
<Caret Line="143" Column="22" TopLine="117"/>
170+
<Caret Line="371" Column="3" TopLine="363"/>
245171
</Position25>
246172
<Position26>
247173
<Filename Value="unit1.pas"/>
248-
<Caret Line="34" Column="5" TopLine="12"/>
174+
<Caret Line="372" Column="3" TopLine="364"/>
249175
</Position26>
250176
<Position27>
251177
<Filename Value="unit1.pas"/>
252-
<Caret Line="147" Column="64" TopLine="122"/>
178+
<Caret Line="373" Column="3" TopLine="365"/>
253179
</Position27>
254180
<Position28>
255181
<Filename Value="unit1.pas"/>
256-
<Caret Line="164" Column="80" TopLine="125"/>
182+
<Caret Line="388" Column="24" TopLine="357"/>
257183
</Position28>
258184
<Position29>
259185
<Filename Value="unit1.pas"/>
260-
<Caret Line="204" Column="81" TopLine="181"/>
186+
<Caret Line="165" Column="30" TopLine="58"/>
261187
</Position29>
262188
<Position30>
263189
<Filename Value="unit1.pas"/>
264-
<Caret Line="145" Column="38" TopLine="188"/>
190+
<Caret Line="387" Column="34" TopLine="356"/>
265191
</Position30>
266192
</JumpHistory>
267193
</ProjectSession>
268-
<Debugging>
269-
<Watches Count="3">
270-
<Item1>
271-
<Expression Value="Head^"/>
272-
</Item1>
273-
<Item2>
274-
<Expression Value="head^.next^"/>
275-
</Item2>
276-
<Item3>
277-
<Expression Value="head^.next^.next^"/>
278-
</Item3>
279-
</Watches>
280-
</Debugging>
281194
</CONFIG>

‎station.pas‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ interface
1010
SWayNum:integer;
1111
x:integer;
1212
y:integer;
13+
isvisited:boolean;
14+
Coefficient:integer;
1315
Public
1416
Procedure SetName(s:string);
1517
Function GetName:string;
@@ -19,7 +21,11 @@ interface
1921
Function GetYCoord:integer;
2022
Procedure AddSWay;
2123
Function NumSWays:integer; // Testing
24+
Procedure SetVisited(b:boolean);
25+
Function GetVisited:boolean;
2226
Function CheckSWays:boolean;
27+
Procedure SetCoefficient(i:integer);
28+
Function GetCoefficient:integer;
2329
Public
2430
Constructor Create;
2531
Destructor Done;
@@ -72,14 +78,36 @@ implementation
7278
if SWayNum>=2 then CheckSWays:=false;
7379
end;
7480

81+
Procedure TStation.SetVisited(b:boolean);
82+
begin
83+
isVisited:=b;
84+
end;
85+
86+
Function TStation.GetVisited:boolean;
87+
begin
88+
GetVisited:=isVisited;
89+
end;
90+
91+
Procedure TStation.SetCoefficient(i:integer);
92+
begin
93+
Coefficient:=i;
94+
end;
95+
96+
Function TStation.GetCoefficient:integer;
97+
begin
98+
GetCoefficient:=Coefficient;
99+
end;
100+
75101
Constructor TStation.Create;
76102
begin
77103
Name:='';
78104
SWayNum:=0;
79105
x:=0;
80106
y:=0;
107+
Coefficient:=32767;
81108
end;
82109

110+
83111
Destructor TStation.Done;
84112
begin end;
85113

0 commit comments

Comments
 (0)