From 2ce118d0986ed816252712c099f253905d44a8c7 Mon Sep 17 00:00:00 2001 From: bounceur Date: Fri, 8 Nov 2019 14:54:01 +0100 Subject: [PATCH] Update. --- .settings/org.eclipse.jdt.core.prefs | 15 -------------- log | 7 +++++++ src/cupcarbon/CupCarbon.java | 12 +++++++----- src/cupcarbon/CupCarbonClient.java | 27 ++++++++++++++++++++++++++ src/cupcarbon/CupCarbonController.java | 2 +- src/cupcarbon/CupClient.java | 25 ------------------------ src/device/MessageEventList.java | 2 +- src/geometry/DPoint.java | 2 +- src/senscript/Command_SEND.java | 3 ++- src/visibility/VisibilityZones.java | 7 +++---- utils/recent.rec | 18 ++++++++--------- 11 files changed, 58 insertions(+), 62 deletions(-) delete mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 log create mode 100755 src/cupcarbon/CupCarbonClient.java delete mode 100755 src/cupcarbon/CupClient.java diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0fee6a9c..00000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,15 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/log b/log new file mode 100644 index 00000000..e4011ee3 --- /dev/null +++ b/log @@ -0,0 +1,7 @@ +Script +000 Adding Sensor: Id=1, name=S1 +000 Adding Sensor: Id=2, name=S2 +000 Adding Sensor: Id=3, name=S3 +000 Adding Sensor: Id=4, name=S4 +000 Adding Sensor: Id=5, name=S5 +000 Adding Sensor: Id=6, name=S6 diff --git a/src/cupcarbon/CupCarbon.java b/src/cupcarbon/CupCarbon.java index 8c9dd06d..5ba3da29 100755 --- a/src/cupcarbon/CupCarbon.java +++ b/src/cupcarbon/CupCarbon.java @@ -76,16 +76,11 @@ public void start(Stage mainStage) throws Exception { } CupActionStack.init(); - setProxy(); setUserAgentStylesheet(STYLESHEET_MODENA); mainStage.setTitle("CupCarbon "+CupCarbonVersion.VERSION); mainStage.getIcons().add(new Image(getClass().getResourceAsStream("cupcarbon_logo_small.png"))); - - - - //stage.setMaximized(true); FXMLLoader loader = new FXMLLoader(); @@ -95,6 +90,7 @@ public void start(Stage mainStage) throws Exception { Scene scene = new Scene(panneau); mainStage.setScene(scene); mainStage.show(); + } public static void main(String[] args) { @@ -105,6 +101,10 @@ public static void main(String[] args) { SolverProxyParams.port = args[2]; } + setProxy(); + //CupCarbonServer server = new CupCarbonServer(); + //server.start(); + launch(args); } @@ -155,6 +155,8 @@ public void run() { } catch (IOException e) { return false; } + + } // ----- diff --git a/src/cupcarbon/CupCarbonClient.java b/src/cupcarbon/CupCarbonClient.java new file mode 100755 index 00000000..7f396d88 --- /dev/null +++ b/src/cupcarbon/CupCarbonClient.java @@ -0,0 +1,27 @@ +package cupcarbon; + +import java.io.IOException; +import java.io.PrintStream; +import java.net.Socket; +import java.net.UnknownHostException; +import java.util.Scanner; + +public class CupCarbonClient { + + public static void main(String args[]) throws UnknownHostException, IOException { + Socket socket = new Socket("localhost", 3000); + PrintStream p = new PrintStream(socket.getOutputStream()); + Scanner scan = new Scanner(System.in); + String str; + System.out.print("sCupCarbon >> "); + while (!(str = scan.nextLine()).equals("exit")) { + System.out.println("> " + str); + System.out.print("sCupCarbon >> "); + p.print(str + "\n"); + } + scan.close(); + p.close(); + socket.close(); + } + +} diff --git a/src/cupcarbon/CupCarbonController.java b/src/cupcarbon/CupCarbonController.java index 828021bd..34da7dd3 100755 --- a/src/cupcarbon/CupCarbonController.java +++ b/src/cupcarbon/CupCarbonController.java @@ -2297,7 +2297,7 @@ public void setCurrentRadio() { CupAction action = new CupActionModifSensorCurrentRadio(sensor, currentRadioModule, newRadioModule); block.addAction(action); currentDevice = sensor; - VisibilityLauncher.calculate(sensor); + //VisibilityLauncher.calculate(sensor); } } CupActionStack.add(block); diff --git a/src/cupcarbon/CupClient.java b/src/cupcarbon/CupClient.java deleted file mode 100755 index 06c88699..00000000 --- a/src/cupcarbon/CupClient.java +++ /dev/null @@ -1,25 +0,0 @@ -package cupcarbon; - -import java.io.IOException; -import java.io.PrintStream; -import java.net.Socket; -import java.net.UnknownHostException; -import java.util.Scanner; - -public class CupClient { - public static void main(String args[]) throws UnknownHostException, IOException { - Socket socket = new Socket("localhost", 3000); - PrintStream p = new PrintStream(socket.getOutputStream()); - Scanner scan = new Scanner(System.in); - String str ; - System.out.print("sCupCarbon >> "); - while(!(str = scan.nextLine()).equals("exit")) { - System.out.println("> "+str); - System.out.print("sCupCarbon >> "); - p.print(str+"\n"); - } - scan.close(); - p.close(); - socket.close(); - } -} diff --git a/src/device/MessageEventList.java b/src/device/MessageEventList.java index f40676c7..20d4c913 100755 --- a/src/device/MessageEventList.java +++ b/src/device/MessageEventList.java @@ -147,7 +147,7 @@ public double getMin() { return min; } - public void drawChannelLinks(Graphics g) { + public void drawChannelLinks(Graphics g) { for(List messageEventList : messageEventLists) { if(messageEventList.size()>0) { Graphics2D g2 = (Graphics2D) g; diff --git a/src/geometry/DPoint.java b/src/geometry/DPoint.java index 34f64d8a..289aba4a 100755 --- a/src/geometry/DPoint.java +++ b/src/geometry/DPoint.java @@ -3,7 +3,7 @@ public class DPoint { private double x; - private double y; + private double y; public DPoint() { super(); diff --git a/src/senscript/Command_SEND.java b/src/senscript/Command_SEND.java index 69487613..678ea914 100755 --- a/src/senscript/Command_SEND.java +++ b/src/senscript/Command_SEND.java @@ -162,7 +162,8 @@ public double execute() { WisenSimulation.simLog.add("S" + sensor.getId() + " is writing the message : \"" + message + "\" in its buffer."); writtenInUART = true ; executing = true; - double ratio = 1.0/(sensor.getUartDataRate()); + //double ratio = 1.0/(sensor.getUartDataRate()); + double ratio = 0.1E-20; return (ratio * (messageLength*8)) ; } diff --git a/src/visibility/VisibilityZones.java b/src/visibility/VisibilityZones.java index 443a8716..6b701095 100755 --- a/src/visibility/VisibilityZones.java +++ b/src/visibility/VisibilityZones.java @@ -81,10 +81,10 @@ public void run() { double deg = 0.0; for (int i = 0; i < nPoint; i++) { if(sensorNode.getCurrentRadioModule().getStandard() == RadioModule.ZIGBEE_802_15_4) - zoneOfInterest.set(sensorNode.getLatitude() + 0.001 * Math.cos(deg),sensorNode.getLongitude() + 0.0015 * Math.sin(deg), 0, i); + zoneOfInterest.set(sensorNode.getLatitude() + 0.001 * Math.cos(deg), sensorNode.getLongitude() + 0.0015 * Math.sin(deg), 0, i); - //if(sensorNode.getCurrentRadioModule().getStandard() == RadioModule.LORA) - // zoneOfInterest.set(sensorNode.getLatitude() + 0.01 * Math.cos(deg),sensorNode.getLongitude() + 0.015 * Math.sin(deg), 0, i); + if(sensorNode.getCurrentRadioModule().getStandard() == RadioModule.LORA) + zoneOfInterest.set(sensorNode.getLatitude() + 0.05 * Math.cos(deg), sensorNode.getLongitude() + 0.075 * Math.sin(deg), 0, i); //if(sensorNode.getCurrentRadioModule().getStandard() == RadioModule.WIFI_802_11) // zoneOfInterest.set(sensorNode.getLatitude() + 0.002 * Math.cos(deg),sensorNode.getLongitude() + 0.003 * Math.sin(deg), 0, i); @@ -189,7 +189,6 @@ public void run() { int k = 0; for (double[] v : visibilityPointList) { zone.set(v[0], v[1], 0, k++); - } // ----------------------------------------------------------------------------------------- diff --git a/utils/recent.rec b/utils/recent.rec index 0b014856..0d584065 100755 --- a/utils/recent.rec +++ b/utils/recent.rec @@ -1,10 +1,10 @@ -/Users/bounceur/Desktop/tmp/test#test.cup -/Users/bounceur/Desktop/cupcarbon_projects/tmp2#tmp2.cup -/Users/bounceur/Desktop/battery_cupcarbon#battery_cupcarbon.cup +/Users/bounceur/Desktop/tmp cupcarbon/projet1#projet1.cup /Users/bounceur/Desktop/cupcarbon_projects/dlpcn_minfind#dlpcn_minfind.cup -/Users/bounceur/Desktop/cupcarbon_projects/tmp4#tmp4.cup -/Users/bounceur/Desktop/tmp#tmp.cup -/Users/bounceur/Downloads/mobility#mobility.cup -/Users/bounceur/Documents/senscripttest#senscripttest.cup -/Users/bounceur/Desktop/av#av.cup -/Users/bounceur/Desktop/cupcarbon_projects/mobility#mobility.cup +/Users/bounceur/Desktop/cupcarbon_projects/dotro#dotro.cup +/Users/bounceur/Desktop/cupcarbon_projects/minfind#minfind.cup +/Users/bounceur/Desktop/cupcarbon_projects/flf#flf.cup +/Users/bounceur/Desktop/cupcarbon_projects/dlpcn#dlpcn.cup +/Users/bounceur/Desktop/cupcarbon_projects/boundary_brogo#boundary_brogo.cup +/Users/bounceur/Desktop/cupcarbon_projects/logo#logo.cup +/Users/bounceur/Desktop/cupcarbon_projects/rbrogo#rbrogo.cup +/Users/bounceur/Desktop/cupcarbon_projects/rand#rand.cup