Skip to content

Agregacja sieci jeszcze bardziej skończona #21

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

Merged
jakubru merged 1 commit into from
May 22, 2017
Merged

Agregacja sieci jeszcze bardziej skończona #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/netKnow/Code/NetworkAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public IP[] aggregateNetwork() {
int mask = j+1;
String [] tmpString1 = {Integer.toString(tmp3[0]), Integer.toString(tmp3[1]), Integer.toString(tmp3[2]),
Integer.toString(tmp3[3]), Integer.toString(mask)};
result[k] = new IP(tmpString1);
while(j > 0) {
result[k] = new IP(tmpString1);
while((tmp3[j / 8] & (128 >> j%8)) == 0) {
tmp2[j / 8] |= 128 >> j % 8;
String[] tmpString = {Integer.toString(tmp2[0]), Integer.toString(tmp2[1]), Integer.toString(tmp2[2]),
Integer.toString(tmp2[3]), Integer.toString(j)};
Expand All @@ -41,8 +41,7 @@ public IP[] aggregateNetwork() {
i = key;
mask = j;
}
if(i < IPArray.length - 1)
result[k].setMask(mask);
result[k].setMask(mask);
j--;
}
k++;
Expand Down
5 changes: 4 additions & 1 deletion src/netKnow/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package netKnow;

import com.mysql.cj.core.conf.IntegerPropertyDefinition;
import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.layout.VBox;
Expand All @@ -14,6 +15,8 @@ public class Main extends Application {

private Stage window;



@Override
public void start(Stage primaryStage) throws Exception{
window = primaryStage;
Expand All @@ -23,7 +26,7 @@ public void start(Stage primaryStage) throws Exception{
new LoginScene(scene);
//new RoutingScene(scene);
window.show();
//window.setFullScreen(true);*/
//window.setFullScreen(true);
}


Expand Down