Skip to content

removed dates #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

removed dates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ab247
removed dates
joksim Mar 5, 2019
4a7859c
added av11 & av12
joksim May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/html5/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ <h2 id="Аудиториска-вежба-6">6. Аудиториска вежб
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-03-05 23:13:55 +01:00
Last updated 2017-03-16 11:59:29 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
2 changes: 1 addition & 1 deletion docs/html5/index_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ <h2 id="exercise-6">6. Exercise 6</h2>
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-03-21 11:41:14 +01:00
Last updated 2017-03-23 11:10:32 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 1</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">16 Февруари, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -925,8 +923,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">2. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-02-16 15:23:40 +01:00
Last updated 2019-03-05 19:13:33 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av10.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 10</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">21 април, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -1155,8 +1153,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">2. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-04-21 16:20:04 +02:00
Last updated 2019-03-05 19:19:19 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
805 changes: 805 additions & 0 deletions docs/html5/oop_av11.html
View file
Open in desktop

Large diffs are not rendered by default.

808 changes: 808 additions & 0 deletions docs/html5/oop_av11_en.html
View file
Open in desktop

Large diffs are not rendered by default.

1,038 changes: 1,038 additions & 0 deletions docs/html5/oop_av12.html
View file
Open in desktop

Large diffs are not rendered by default.

1,037 changes: 1,037 additions & 0 deletions docs/html5/oop_av12_en.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/html5/oop_av1_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ <h2 id="source-code-of-the-examples-and-problems">2. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-02-16 16:02:35 +01:00
Last updated 2017-03-02 12:03:43 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 2</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">20 Февруари, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -1146,8 +1144,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">5. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-02-27 12:01:10 +01:00
Last updated 2019-03-05 19:18:19 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
2 changes: 1 addition & 1 deletion docs/html5/oop_av2_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ <h2 id="source-code-of-the-examples-and-problems">5. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-02-27 12:01:34 +01:00
Last updated 2017-03-02 12:03:43 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 3</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">21 Февруари, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -892,8 +890,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">3. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-02-24 10:47:58 +01:00
Last updated 2019-03-05 19:18:24 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
2 changes: 1 addition & 1 deletion docs/html5/oop_av3_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ <h2 id="source-code-of-the-examples-and-problems">3. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-02-27 11:57:02 +01:00
Last updated 2017-03-02 12:03:43 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 4</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">27 Февруари, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -938,8 +936,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">2. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-02-27 22:35:05 +01:00
Last updated 2019-03-05 19:18:31 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
75 changes: 36 additions & 39 deletions docs/html5/oop_av4_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,79 +652,76 @@ <h3 id="team">1.2. Team</h3>
<span class="directive">private</span>:
<span class="predefined-type">char</span> name[<span class="integer">100</span>];
<span class="predefined-type">int</span> yearFounded;
<span class="predefined-type">char</span> city[<span class="integer">100</span>];
<span class="predefined-type">char</span> city[<span class="integer">50</span>];
<span class="directive">public</span>:
Team(<span class="directive">const</span> <span class="predefined-type">char</span> *name = <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>, <span class="directive">const</span> <span class="predefined-type">int</span> yearFounded = <span class="integer">0</span>,
<span class="directive">const</span> <span class="predefined-type">char</span> *city = <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>) {
strcpy(<span class="local-variable">this</span>-&gt;name, name);
<span class="local-variable">this</span>-&gt;yearFounded = yearFounded;
strcpy(<span class="local-variable">this</span>-&gt;city, city);
Team() {
}
Team(<span class="directive">const</span> <span class="predefined-type">char</span>* n, <span class="predefined-type">int</span> yf, <span class="directive">const</span> <span class="predefined-type">char</span>*c) {
strcpy(name, n);
yearFounded = yf;
strcpy(city, c);
}

<span class="predefined-type">char</span> *getName() {
<span class="keyword">return</span> name;
<span class="predefined-type">bool</span> equalTeam(Team&amp; team) {
<span class="keyword">return</span> strcmp(team.name, name) == <span class="integer">0</span>;
}

<span class="directive">void</span> print() {
cout &lt;&lt; name &lt;&lt; <span class="string"><span class="delimiter">&quot;</span><span class="content"> </span><span class="delimiter">&quot;</span></span> &lt;&lt; yearFounded &lt;&lt; endl;
cout &lt;&lt; name &lt;&lt; <span class="string"><span class="delimiter">&quot;</span><span class="content"> </span><span class="delimiter">&quot;</span></span> &lt;&lt; yearFounded &lt;&lt; <span class="string"><span class="delimiter">&quot;</span><span class="content"> </span><span class="delimiter">&quot;</span></span> &lt;&lt; city &lt;&lt; endl;
}

};

<span class="keyword">class</span> <span class="class">Game</span> {
<span class="directive">private</span>:
Team host;
Team guest;
<span class="predefined-type">int</span> hostGoals;
<span class="predefined-type">int</span> guestGoals;
<span class="predefined-type">int</span> goalsHost;
<span class="predefined-type">int</span> goalsGuest;
<span class="directive">public</span>:
Game(<span class="directive">const</span> Team host = Team(), <span class="directive">const</span> Team guest = Team(),
<span class="directive">const</span> <span class="predefined-type">int</span> hostGoals = <span class="integer">0</span>, <span class="directive">const</span> <span class="predefined-type">int</span> guestGoals = <span class="integer">0</span>) {
Game(Team&amp; host, Team&amp; guest, <span class="predefined-type">int</span> gh, <span class="predefined-type">int</span> gg) {
<span class="local-variable">this</span>-&gt;host = host;
<span class="local-variable">this</span>-&gt;guest = guest;
<span class="local-variable">this</span>-&gt;hostGoals = hostGoals;
<span class="local-variable">this</span>-&gt;guestGoals = guestGoals;
goalsHost = gh;
goalsGuest = gg;
}

Team getHost() <span class="directive">const</span> {
<span class="keyword">return</span> host;
}
Team getGuest() <span class="directive">const</span> {
<span class="keyword">return</span> guest;
<span class="predefined-type">bool</span> equalsGuest(Game&amp; game) {
<span class="keyword">return</span> host.equalTeam(game.guest);
}

<span class="predefined-type">int</span> getHostGoals() <span class="directive">const</span> {
<span class="keyword">return</span> hostGoals;
<span class="predefined-type">bool</span> equalHost(Game&amp; game) {
<span class="keyword">return</span> guest.equalTeam(game.host);
}

<span class="predefined-type">int</span> getGuestGoals() <span class="directive">const</span> {
<span class="keyword">return</span> guestGoals;
Team winner(Game game) {
<span class="predefined-type">int</span> goals1 = goalsHost + game.goalsGuest;
<span class="predefined-type">int</span> goals2 = goalsGuest + game.goalsHost;
<span class="keyword">if</span>(goals1 &gt; goals2) {
<span class="keyword">return</span> host;
} <span class="keyword">else</span> {
<span class="keyword">return</span> guest;
}
}

};

Team winner(<span class="directive">const</span> Game game1, <span class="directive">const</span> Game game2) {
<span class="keyword">if</span> (strcmp(game1.getHost().getName(), game2.getGuest().getName()) == <span class="integer">0</span> &amp;&amp;
strcmp(game2.getHost().getName(), game1.getGuest().getName()) == <span class="integer">0</span>) {
<span class="predefined-type">int</span> goalsHost = game1.getHostGoals() + game2.getGuestGoals();
<span class="predefined-type">int</span> goalsGuest = game1.getGuestGoals() + game2.getHostGoals();
<span class="keyword">if</span> (goalsHost &gt;= goalsGuest) {
<span class="keyword">return</span> game1.getHost();
} <span class="keyword">else</span> {
<span class="keyword">return</span> game1.getGuest();
}
Team winner(Game&amp; game1, Game&amp; game2) {
<span class="keyword">if</span>(game1.equalHost(game2) &amp;&amp; game1.equalsGuest(game2)) {
<span class="keyword">return</span> game1.winner(game2);
} <span class="keyword">else</span> {
<span class="keyword">return</span> Team(<span class="string"><span class="delimiter">&quot;</span><span class="content">Dummy</span><span class="delimiter">&quot;</span></span>, <span class="integer">0</span>, <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>);
}
<span class="keyword">return</span> Team();
}

<span class="predefined-type">int</span> main() {
Team t1(<span class="string"><span class="delimiter">&quot;</span><span class="content">Barcelona</span><span class="delimiter">&quot;</span></span>, <span class="integer">1900</span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">Barcelona</span><span class="delimiter">&quot;</span></span>);
Team t2(<span class="string"><span class="delimiter">&quot;</span><span class="content">Real Madrid</span><span class="delimiter">&quot;</span></span>, <span class="integer">1890</span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">Madrid</span><span class="delimiter">&quot;</span></span>);
Team t3(<span class="string"><span class="delimiter">&quot;</span><span class="content">Elche</span><span class="delimiter">&quot;</span></span>, <span class="integer">1950</span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">Elche</span><span class="delimiter">&quot;</span></span>);

Game g1(t1, t2, <span class="integer">5</span>, <span class="integer">0</span>);
Game g2(t2, t1, <span class="integer">2</span>, <span class="integer">2</span>);
Game g3(t1, t3, <span class="integer">6</span>, <span class="integer">2</span>);
Team w = winner(g1, g2);

Team w = winner(g1, g3);
w.print();
<span class="keyword">return</span> <span class="integer">0</span>;
}</code></pre>
Expand All @@ -749,7 +746,7 @@ <h2 id="source-code-of-the-examples-and-problems">2. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-03-03 10:51:57 +01:00
Last updated 2017-03-16 11:59:29 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 5</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">27 Февруари, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -1183,8 +1181,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">3. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-03-05 23:10:22 +01:00
Last updated 2019-03-05 19:18:36 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
6 changes: 3 additions & 3 deletions docs/html5/oop_av5_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 1.5.4">
<meta name="author" content="Exercises 4">
<meta name="author" content="Exercises 5">
<title>Object oriented programming</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
<style>
Expand Down Expand Up @@ -514,7 +514,7 @@
<div id="header">
<h1>Object oriented programming</h1>
<div class="details">
<span id="author" class="author">Exercises 4</span><br>
<span id="author" class="author">Exercises 5</span><br>
<span id="revnumber">version 1.0,</span>
<span id="revdate">16 March, 2017</span>
</div>
Expand Down Expand Up @@ -1203,7 +1203,7 @@ <h2 id="source-code-of-the-examples-and-problems">3. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-03-16 16:06:15 +01:00
Last updated 2017-03-23 11:10:32 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av6.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 6</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">05 март, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -1216,8 +1214,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">3. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-03-05 23:12:59 +01:00
Last updated 2019-03-05 19:18:44 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
2 changes: 1 addition & 1 deletion docs/html5/oop_av6_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ <h2 id="source-code-of-the-examples-and-problems">3. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-03-21 11:31:27 +01:00
Last updated 2017-03-23 11:10:32 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av7.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 7</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">03 април, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -801,8 +799,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">2. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-04-03 10:39:42 +02:00
Last updated 2019-03-05 19:18:50 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
2 changes: 1 addition & 1 deletion docs/html5/oop_av7_en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ <h2 id="source-code-of-the-examples-and-problems">2. Source code of the examples
<div id="footer">
<div id="footer-text">
Version 1.0<br>
Last updated 2017-04-11 08:42:38 +02:00
Last updated 2017-04-27 12:06:15 +02:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
5 changes: 1 addition & 4 deletions docs/html5/oop_av8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,6 @@
<h1>Објектно ориентирано програмирање</h1>
<div class="details">
<span id="author" class="author">Аудиториски вежби 8</span><br>
<span id="revnumber">Верзија 1.0,</span>
<span id="revdate">10 април, 2017</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Содржина</div>
Expand Down Expand Up @@ -959,8 +957,7 @@ <h2 id="Изворен-код-од-примери-и-задачи">2. Извор
</div>
<div id="footer">
<div id="footer-text">
Верзија 1.0<br>
Last updated 2017-04-11 16:13:39 +02:00
Last updated 2019-03-05 19:18:56 +01:00
</div>
</div>
<script type="text/x-mathjax-config">
Expand Down
Loading