SF2311 / travelling-salesman (public) (License: Unspecified) (since 2018-04-18) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/SF2311/travelling-salesman ssh://rocketgit@ssh.rocketgit.com/user/SF2311/travelling-salesman git://git.rocketgit.com/user/SF2311/travelling-salesman
dev master
List of commits:
Subject Hash Author Date (UTC)
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 0d55315b39e973974793aadfc188dc9e055ef029 - prepared data structure
Author: SF2311
Author date (UTC): 2018-04-25 13:10
Committer name: SF2311
Committer date (UTC): 2018-04-25 13:10
Parent(s): 057841348e42a9bf916d6b5bf8d8f069a8e4f555
Signer:
Signing key:
Signing status: N
Tree: 264e114c233602f5bb694438a988ad8eca1a2d61
File Lines added Lines deleted
src/salesman/data/Order.java 22 0
src/salesman/salesman/algorithms/AlgorithmBrutForce.java 12 0
src/salesman/ui/Algorythm.java 0 10
src/salesman/ui/BrutForceController.java 2 1
src/salesman/ui/MainWindow.fxml 1 1
src/salesman/ui/MainWindowController.java 6 0
File src/salesman/data/Order.java added (mode: 100644) (index 0000000..6d5a595)
1 package salesman.data;
2
3 public class Order {
4 private int[] order;
5
6 public Order(City[] cities){
7 order=new int[cities.length];
8 }
9 public int getIndex(int index){
10 return order[index];
11 }
12 public void setIndex(int index,int toSet){
13 order[index]=toSet;
14 }
15 public int getTotalLength(){
16 int length=0;
17 for(int i: order){
18 //TODO implement calculation of length
19 }
20 return length;
21 }
22 }
File src/salesman/salesman/algorithms/AlgorithmBrutForce.java added (mode: 100644) (index 0000000..26ddb54)
1 package salesman.salesman.algorithms;
2
3 public class AlgorithmBrutForce extends Thread{
4
5
6
7 @Override
8 public void run(){
9
10 }
11
12 }
File src/salesman/ui/Algorythm.java deleted (index c392d83..0000000)
1 package salesman.ui;
2
3 public class Algorythm extends Thread{
4
5 @Override
6 public void run(){
7
8 }
9
10 }
File src/salesman/ui/BrutForceController.java changed (mode: 100644) (index 086a081..46ce64f)
... ... import javafx.event.ActionEvent;
4 4 import javafx.event.EventHandler; import javafx.event.EventHandler;
5 5 import javafx.fxml.FXML; import javafx.fxml.FXML;
6 6 import javafx.scene.control.Button; import javafx.scene.control.Button;
7 import salesman.salesman.algorithms.AlgorithmBrutForce;
7 8
8 9
9 10 public class BrutForceController { public class BrutForceController {
 
... ... public class BrutForceController {
15 16 btnStart.setOnAction(new EventHandler<ActionEvent>() { btnStart.setOnAction(new EventHandler<ActionEvent>() {
16 17 @Override @Override
17 18 public void handle(ActionEvent event) { public void handle(ActionEvent event) {
18 new Algorythm().start();
19 new AlgorithmBrutForce().start();
19 20 } }
20 21 }); });
21 22 } }
File src/salesman/ui/MainWindow.fxml changed (mode: 100644) (index 0e23a0c..414ae3c)
30 30 </rowConstraints> </rowConstraints>
31 31 <children> <children>
32 32 <Label text="Anzahl Städte" /> <Label text="Anzahl Städte" />
33 <TextField text="10" GridPane.columnIndex="1" />
33 <TextField text="10" GridPane.columnIndex="1" fx:id="txtFieldNumCities"/>
34 34 <ComboBox fx:id="cBalgorithm" prefWidth="150.0" promptText="Algorithmus" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" /> <ComboBox fx:id="cBalgorithm" prefWidth="150.0" promptText="Algorithmus" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
35 35 </children> </children>
36 36 </GridPane> </GridPane>
File src/salesman/ui/MainWindowController.java changed (mode: 100644) (index 75535f7..ff9b617)
... ... import javafx.collections.ObservableList;
7 7 import javafx.fxml.FXML; import javafx.fxml.FXML;
8 8 import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
9 9 import javafx.scene.control.ComboBox; import javafx.scene.control.ComboBox;
10 import javafx.scene.control.TextField;
10 11 import javafx.scene.input.MouseEvent; import javafx.scene.input.MouseEvent;
11 12 import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
12 13 import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
 
... ... public class MainWindowController {
22 23 private Pane paneCities; private Pane paneCities;
23 24 @FXML @FXML
24 25 private VBox upperMenu; private VBox upperMenu;
26 @FXML
27 private static TextField txtFieldNumCities;
25 28
29 public static int getNumOfCities(){
30 return Integer.valueOf(txtFieldNumCities.getText());
31 }
26 32
27 33 private GridPane actualMenu; private GridPane actualMenu;
28 34
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