From 92e4256b15295fa27f2a1676ed92a0d46468cdb5 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Thu, 7 Jun 2018 17:03:37 +0200 Subject: [PATCH] Removing penalties --- .idea/gradle.xml | 27 ------------------- simulators/c++2/src_simulator/definitions.h | 2 +- .../java/myutil/BoolExpressionEvaluator.java | 0 src/main/java/myutil/BrowserControl.java | 0 .../java/myutil/CallbackLoaderInterface.java | 0 src/main/java/myutil/Conversion.java | 0 src/main/java/myutil/DijkstraState.java | 0 src/main/java/myutil/ErrorThread.java | 0 src/main/java/myutil/ExternalCall.java | 0 src/main/java/myutil/FileException.java | 0 src/main/java/myutil/FileUtils.java | 0 src/main/java/myutil/GenericTree.java | 0 src/main/java/myutil/Graph.java | 0 src/main/java/myutil/GraphAlgorithms.java | 0 src/main/java/myutil/GraphicLib.java | 0 .../myutil/HTMLCodeGeneratorForTables.java | 0 src/main/java/myutil/ImageManager.java | 0 .../java/myutil/IntExpressionEvaluator.java | 0 src/main/java/myutil/IntLine.java | 0 src/main/java/myutil/IntMatrix.java | 0 .../java/myutil/LoaderFacilityInterface.java | 0 .../MalformedConfigurationException.java | 0 .../java/myutil/MasterProcessInterface.java | 0 src/main/java/myutil/MyMath.java | 0 src/main/java/myutil/PeriodicBehavior.java | 0 .../java/myutil/PeriodicBehaviorThread.java | 0 src/main/java/myutil/Plugin.java | 0 src/main/java/myutil/PluginManager.java | 0 src/main/java/myutil/ProcessThread.java | 0 src/main/java/myutil/SVGGraphics.java | 0 src/main/java/myutil/ScrolledJTextArea.java | 0 src/main/java/myutil/SortedVector.java | 0 src/main/java/myutil/SteppedAlgorithm.java | 0 src/main/java/myutil/TableSorter.java | 0 src/main/java/myutil/TreeCell.java | 0 src/main/java/myutil/URLManager.java | 0 ttool/src/main/java/Main.java | 1 + 37 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 .idea/gradle.xml mode change 100755 => 100644 src/main/java/myutil/BoolExpressionEvaluator.java mode change 100755 => 100644 src/main/java/myutil/BrowserControl.java mode change 100755 => 100644 src/main/java/myutil/CallbackLoaderInterface.java mode change 100755 => 100644 src/main/java/myutil/Conversion.java mode change 100755 => 100644 src/main/java/myutil/DijkstraState.java mode change 100755 => 100644 src/main/java/myutil/ErrorThread.java mode change 100755 => 100644 src/main/java/myutil/ExternalCall.java mode change 100755 => 100644 src/main/java/myutil/FileException.java mode change 100755 => 100644 src/main/java/myutil/FileUtils.java mode change 100755 => 100644 src/main/java/myutil/GenericTree.java mode change 100755 => 100644 src/main/java/myutil/Graph.java mode change 100755 => 100644 src/main/java/myutil/GraphAlgorithms.java mode change 100755 => 100644 src/main/java/myutil/GraphicLib.java mode change 100755 => 100644 src/main/java/myutil/HTMLCodeGeneratorForTables.java mode change 100755 => 100644 src/main/java/myutil/ImageManager.java mode change 100755 => 100644 src/main/java/myutil/IntExpressionEvaluator.java mode change 100755 => 100644 src/main/java/myutil/IntLine.java mode change 100755 => 100644 src/main/java/myutil/IntMatrix.java mode change 100755 => 100644 src/main/java/myutil/LoaderFacilityInterface.java mode change 100755 => 100644 src/main/java/myutil/MalformedConfigurationException.java mode change 100755 => 100644 src/main/java/myutil/MasterProcessInterface.java mode change 100755 => 100644 src/main/java/myutil/MyMath.java mode change 100755 => 100644 src/main/java/myutil/PeriodicBehavior.java mode change 100755 => 100644 src/main/java/myutil/PeriodicBehaviorThread.java mode change 100755 => 100644 src/main/java/myutil/Plugin.java mode change 100755 => 100644 src/main/java/myutil/PluginManager.java mode change 100755 => 100644 src/main/java/myutil/ProcessThread.java mode change 100755 => 100644 src/main/java/myutil/SVGGraphics.java mode change 100755 => 100644 src/main/java/myutil/ScrolledJTextArea.java mode change 100755 => 100644 src/main/java/myutil/SortedVector.java mode change 100755 => 100644 src/main/java/myutil/SteppedAlgorithm.java mode change 100755 => 100644 src/main/java/myutil/TableSorter.java mode change 100755 => 100644 src/main/java/myutil/TreeCell.java mode change 100755 => 100644 src/main/java/myutil/URLManager.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 5efd0b349e..0000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="GradleSettings"> - <option name="linkedExternalProjectsSettings"> - <GradleProjectSettings> - <option name="distributionType" value="DEFAULT_WRAPPED" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="modules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/graphminimize" /> - <option value="$PROJECT_DIR$/graphshow" /> - <option value="$PROJECT_DIR$/launcher" /> - <option value="$PROJECT_DIR$/rundse" /> - <option value="$PROJECT_DIR$/simulationcontrol" /> - <option value="$PROJECT_DIR$/tiftranslator" /> - <option value="$PROJECT_DIR$/tmltranslator" /> - <option value="$PROJECT_DIR$/ttool" /> - <option value="$PROJECT_DIR$/webcrawler/client" /> - <option value="$PROJECT_DIR$/webcrawler/server" /> - </set> - </option> - <option name="useAutoImport" value="true" /> - </GradleProjectSettings> - </option> - </component> -</project> \ No newline at end of file diff --git a/simulators/c++2/src_simulator/definitions.h b/simulators/c++2/src_simulator/definitions.h index b722220a21..cc088c70f6 100644 --- a/simulators/c++2/src_simulator/definitions.h +++ b/simulators/c++2/src_simulator/definitions.h @@ -89,7 +89,7 @@ using std::max; //cost of a send/wait command #define WAIT_SEND_VLEN 1 //activate tis flag to take penalties (energy mode, branch prediction, context switch) into account -#define PENALTIES_ENABLED +#undef PENALTIES_ENABLED //enables the state hash feature #undef STATE_HASH_ENABLED //enables listerns for interactive simulation, switch off for fast simulation in command line mode diff --git a/src/main/java/myutil/BoolExpressionEvaluator.java b/src/main/java/myutil/BoolExpressionEvaluator.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/BrowserControl.java b/src/main/java/myutil/BrowserControl.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/CallbackLoaderInterface.java b/src/main/java/myutil/CallbackLoaderInterface.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/Conversion.java b/src/main/java/myutil/Conversion.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/DijkstraState.java b/src/main/java/myutil/DijkstraState.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/ErrorThread.java b/src/main/java/myutil/ErrorThread.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/ExternalCall.java b/src/main/java/myutil/ExternalCall.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/FileException.java b/src/main/java/myutil/FileException.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/FileUtils.java b/src/main/java/myutil/FileUtils.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/GenericTree.java b/src/main/java/myutil/GenericTree.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/Graph.java b/src/main/java/myutil/Graph.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/GraphAlgorithms.java b/src/main/java/myutil/GraphAlgorithms.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/GraphicLib.java b/src/main/java/myutil/GraphicLib.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/HTMLCodeGeneratorForTables.java b/src/main/java/myutil/HTMLCodeGeneratorForTables.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/ImageManager.java b/src/main/java/myutil/ImageManager.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/IntExpressionEvaluator.java b/src/main/java/myutil/IntExpressionEvaluator.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/IntLine.java b/src/main/java/myutil/IntLine.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/IntMatrix.java b/src/main/java/myutil/IntMatrix.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/LoaderFacilityInterface.java b/src/main/java/myutil/LoaderFacilityInterface.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/MalformedConfigurationException.java b/src/main/java/myutil/MalformedConfigurationException.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/MasterProcessInterface.java b/src/main/java/myutil/MasterProcessInterface.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/MyMath.java b/src/main/java/myutil/MyMath.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/PeriodicBehavior.java b/src/main/java/myutil/PeriodicBehavior.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/PeriodicBehaviorThread.java b/src/main/java/myutil/PeriodicBehaviorThread.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/Plugin.java b/src/main/java/myutil/Plugin.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/PluginManager.java b/src/main/java/myutil/PluginManager.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/ProcessThread.java b/src/main/java/myutil/ProcessThread.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/SVGGraphics.java b/src/main/java/myutil/SVGGraphics.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/ScrolledJTextArea.java b/src/main/java/myutil/ScrolledJTextArea.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/SortedVector.java b/src/main/java/myutil/SortedVector.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/SteppedAlgorithm.java b/src/main/java/myutil/SteppedAlgorithm.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/TableSorter.java b/src/main/java/myutil/TableSorter.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/TreeCell.java b/src/main/java/myutil/TreeCell.java old mode 100755 new mode 100644 diff --git a/src/main/java/myutil/URLManager.java b/src/main/java/myutil/URLManager.java old mode 100755 new mode 100644 diff --git a/ttool/src/main/java/Main.java b/ttool/src/main/java/Main.java index 62b42bc7e9..85a5336c76 100755 --- a/ttool/src/main/java/Main.java +++ b/ttool/src/main/java/Main.java @@ -55,6 +55,7 @@ import ui.TToolUpdater; import ui.util.DefaultText; import ui.util.IconManager; import ui.window.JStartingWindow; +import myutil.*; import javax.swing.*; import java.awt.*; -- GitLab