List of commits:
Subject Hash Author Date (UTC)
Merge branch 'dev' of T:\GIPS\Klassen\2017_GIPS_J1\Informatik JB\ts into dev 0fa550b00774b011f7e87ef1ac5b8fbdb9abb0bc ani.moosb 2018-04-25 13:25:48
new class Algorythm to implement BrutForce algorithm cd2f3565cc145dd9f14290b727f74ea0281ef2c7 ani.moosb 2018-04-25 13:12:14
prepared data structure 0d55315b39e973974793aadfc188dc9e055ef029 SF2311 2018-04-25 13:10:50
added class City for represnetation of data 057841348e42a9bf916d6b5bf8d8f069a8e4f555 SF2311 2018-04-25 12:42:18
new class Algorythm to implement BrutForce algorithm c0ba57e67447133ed5b2fcde4cc9c6a2c61a1036 ani.moosb 2018-04-25 12:29:31
Fixed menu loading problems 9858b4b11fd912d8b40e681b772bf0ef16678ca6 SF2311 2018-04-20 17:07:20
Added Menu loading 428354d568e6bf97e45ec4c416ce9b3db227eea4 SF2311 2018-04-20 16:12:55
designed main window added launching main window added first menu part in form of gridpane 1f4e52733f4aeb9524fb0f40f8cf7604aaf17898 SF2311 2018-04-19 16:15:30
prepared User interface cfad65413554fbd7a1026f2c8e73e73e996df69d SF2311 2018-04-18 18:51:26
initial commit 272ab94837f2e39f77b768df08a25a78466d52d1 SF2311 2018-04-18 18:43:17
Commit 0fa550b00774b011f7e87ef1ac5b8fbdb9abb0bc - Merge branch 'dev' of T:\GIPS\Klassen\2017_GIPS_J1\Informatik JB\ts into dev
# Conflicts:
# src/salesman/ui/Algorythm.java
Author: ani.moosb
Author date (UTC): 2018-04-25 13:25
Committer name: ani.moosb
Committer date (UTC): 2018-04-25 13:25
Parent(s): 53217785747de1dd6a61176c43bf0e6ae7e4d146
Signer:
Signing key:
Signing status: N
Tree: b16c18360716ce4495a47db691e6cc9c084a8573
File Lines added Lines deleted
src/salesman/ui/Algorythm.java 10 0
File src/salesman/ui/Algorythm.java changed (mode: 100644) (index 3f9336f..ed7724d)
... ... package salesman.ui;
2 2
3 3 import salesman.data.City; import salesman.data.City;
4 4
5 import java.util.Random;
6
5 7 public class Algorythm extends Thread{ public class Algorythm extends Thread{
6 8
9 City[] cities = new City[MainWindowController.getNumOfCities()];
10
7 11 @Override @Override
8 12 public void run(){ public void run(){
9 13
14 for(int i =0;i<cities.length;i++){
15 Random r = new Random();
16
17 cities[i] =new City(r.nextInt(600), r.nextInt(800), i);
18 }
19
10 20
11 21
12 22 } }
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/SF2311/travelling-salesman

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/SF2311/travelling-salesman

Clone this repository using git:
git clone git://git.rocketgit.com/user/SF2311/travelling-salesman

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main