Adding new logo: smiling diplo

simulators/c++2/src_simulator/ServerHelpData.h

@@ -13,8 +13,9 @@
     div.column{display: inline-block; vertical-align: top; width: 50%;} \n\
     div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;} \n\
     ul.task-list{list-style: none;} \n\
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;} \n\
   </style> \n\
-  <link rel=\"stylesheet\" href=\"/home/levan/Desktop/TTool/src/main/resources/help/help.css\" /> \n\
+  <link rel=\"stylesheet\" href=\"/Users/ludovicapvrille/TTool/src/main/resources/help/help.css\" /> \n\
   <!--[if lt IE 9]> \n\
     <script src=\"//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js\"></script> \n\
   <![endif]--> \n\
@@ -24,7 +25,7 @@
 <h2 id=\"objective\">Objective</h2> \n\
 <p>The simulator of DIPLODOCUS intends to simulate a DIPLODOCUS mapping, taking into account functional tasks, the system architectures (CPU, buses, etc.) and the allocations of tasks and their communucations to the system architecture</p> \n\
 <h2 id=\"generating-simulation-code-and-commiling-it\">Generating simulation code and commiling it?</h2> \n\
-<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src=\"file:../ui/util/checkmodel.gif\" alt=\"syntax checking icon\" />, it is possible to generate a C++ code <img src=\"file:../ui/util/gensystc.gif\" alt=\"simulation code generation icon\" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the \"c++_code\" subdirectory of your project.</p> \n\
+<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src=\"file:../ui/util/checkmodel.gif\" alt=\"syntax checking icon\" />, it is possible to generate a C++ code <img src=\"file:../ui/util/gensystc.gif\" alt=\"simulation code generation icon\" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the “c++_code” subdirectory of your project.</p> \n\
 <p>The second step is to compile the code. You can directly do it from TTool with the code generation window, second tab. Another option is to open a terminal, and to enter the following command:</p> \n\
 <pre><code>$ make</code></pre> \n\
 <h2 id=\"using-the-simulator-from-ttool\">Using the simulator from TTool</h2> \n\
@@ -482,7 +483,7 @@ Not defined: &lt;unknow param&gt;</code></pre> \n\
 <td style=\"text-align: center;\">show-timeline-trace</td> \n\
 <td style=\"text-align: center;\">stlt</td> \n\
 <td style=\"text-align: center;\">7 4</td> \n\
-<td style=\"text-align: center;\">Show the current timeline diagram tracein HTML format</td> \n\
+<td style=\"text-align: center;\">Show the current timeline diagram trace in HTML format</td> \n\
 <td style=\"text-align: center;\">[Type: 2] Task List</td> \n\
 <td style=\"text-align: center;\">[Type: 1] Scale idle time: 0 -&gt; no, 1 -&gt; yes</td> \n\
 <td style=\"text-align: center;\">[Type: 2] Start Time</td> \n\

simulators/c++2/src_simulator/arch/CPU.cpp

@@ -51,7 +51,7 @@ double CPU::averageLoad (unsigned int n) const{
       _maxEndTime=max(_maxEndTime,_endTime);
     }
   }
-  std::cout<<"max end time is "<<_maxEndTime<<std::endl;
+  //std::cout<<"max end time is "<<_maxEndTime<<std::endl;
   for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
     if( (*i)->getTransactCoreNumber() == n ){
       _averageLoad += (*i)->getEndTime() - (*i)->getStartTime();
@@ -200,8 +200,8 @@ std::map<TMLTask*, std::string> CPU::HWTIMELINE2HTML(std::ostringstream& myfile,
             }
         }
         for( TransactionList::const_iterator i = _transactListClone.begin(); i != _transactListClone.end(); ++i ) {
-          std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
-          std::cout<<"time : "<<_cycleTime<<std::endl;
+          //std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
+          //std::cout<<"time : "<<_cycleTime<<std::endl;
           //std::cout << "CPU:calcSTL: html of CPU " << _name << ": " << (*i)->toString() << std::endl;
           if( (*i)->getTransactCoreNumber() == this->_cycleTime ){
         TMLTransaction* aCurrTrans = *i;
@@ -279,9 +279,18 @@ std::map<TMLTask*, std::string> CPU::HWTIMELINE2HTML(std::ostringstream& myfile,
         // Issue #4
         TMLTask* task = aCurrTrans->getCommand()->getTask();
         const std::string cellClass = determineHTMLCellClass( taskCellClasses, task, nextCellClassIndex );
-        std::string aCurrTransName=aCurrTrans->toShortString();
-        unsigned int indexTrans=aCurrTransName.find_first_of(":");
-        std::string aCurrContent=aCurrTransName.substr(indexTrans+1,2);
+        std::string aCurrTransName = aCurrTrans->toShortString();
+        unsigned int indexTrans = aCurrTransName.find_first_of(":");
+	std::string aNextCont = aCurrTransName.substr(indexTrans+2,3);
+	std::string aCurrContent;
+	std::string a = "a";
+	//std::cout << "aNextCont:" << aNextCont<< ": " << a << std::endl;
+	if (aNextCont[1] == a[0]) {
+	  aCurrContent=aCurrTransName.substr(indexTrans+1,3);
+	} else {
+	  aCurrContent=aCurrTransName.substr(indexTrans+1,2);
+	}
+	
         if(!(!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())){
           if (isScalable && endTimeOfCore >= MIN_RESIZE_THRESHOLD && aLength > MIN_RESIZE_TRANS){
               int tempLength = 0;
@@ -388,8 +397,8 @@ void CPU::HW2HTML(std::ofstream& myfile) const {
     }
 
     for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
-      std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
-      std::cout<<"time : "<<_cycleTime<<std::endl;
+      //std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
+      //std::cout<<"time : "<<_cycleTime<<std::endl;
       //std::cout << "CPU:calcSTL: html of CPU " << _name << ": " << (*i)->toString() << std::endl;
       if( (*i)->getTransactCoreNumber() == this->_cycleTime ){
 	TMLTransaction* aCurrTrans = *i;
@@ -533,8 +542,8 @@ void CPU::schedule2HTML(std::ofstream& myfile) const {
             }
     }
     for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
-      std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
-      std::cout<<"time : "<<_cycleTime<<std::endl;
+      //std::cout<<"get transaction core number is: "<<(*i)->getTransactCoreNumber()<<std::endl;
+      //std::cout<<"time : "<<_cycleTime<<std::endl;
       //std::cout << "CPU:calcSTL: html of CPU " << _name << ": " << (*i)->toString() << std::endl;
       if( (*i)->getTransactCoreNumber() == this->_cycleTime ){
 	TMLTransaction* aCurrTrans = *i;

simulators/c++2/src_simulator/arch/FPGA.cpp

@@ -763,7 +763,16 @@ std::map<TMLTask*, std::string> FPGA::HWTIMELINE2HTML(std::ostringstream& myfile
         const std::string cellClass = determineHTMLCellClass( taskCellClasses1, _htmlCurrTask, nextCellClassIndex1);
         std::string aCurrTransName=aCurrTrans->toShortString();
         unsigned int indexTrans=aCurrTransName.find_first_of(":");
-        std::string aCurrContent=aCurrTransName.substr(indexTrans+1,2);
+	std::string aNextCont = aCurrTransName.substr(indexTrans+2,3);
+	std::string aCurrContent;
+	std::string a = "a";
+	//std::cout << "aNextCont:" << aNextCont<< ": " << a << std::endl;
+	if (aNextCont[1] == a[0]) {
+	  aCurrContent=aCurrTransName.substr(indexTrans+1,3);
+	} else {
+	  aCurrContent=aCurrTransName.substr(indexTrans+1,2);
+	}
+        
         if(!(!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())){
           if(isScalable && _htmlCurrTask->getEndLastTransaction() >= MIN_RESIZE_THRESHOLD && aLength > MIN_RESIZE_TRANS){
               int tempLength = 0;

simulators/c++2/src_simulator/sim/Simulator.cpp

@@ -2069,8 +2069,8 @@ void Simulator::decodeCommand(std::string iCmd, std::ostream& iXmlOutStream){
     case 3: //XML
       aGlobMsg << TAG_MSGo << "Schedule output in XML format" << TAG_MSGc << std::endl;
       schedule2XML(anEntityMsg,aStrParam);
-    case 4: {//timeline diagram
-      aGlobMsg << TAG_MSGo << "Schedule output in HTML format" << TAG_MSGc << std::endl;
+    case 4: {// Timeline diagram
+      aGlobMsg << TAG_MSGo << "Schedule output in timeline format" << TAG_MSGc << std::endl;
       std::ostringstream timelineContent;
       int temp = 0;
       aInpStream >> temp;
@@ -2768,4 +2768,4 @@ void Simulator::writeSimState(std::ostream& ioMessage){
       if (_simComp->getStopReason()!="") ioMessage << TAG_REASONo << _simComp->getStopReason() << TAG_REASONc;
     }
   }
-}
+}
\ No newline at end of file

src/main/java/remotesimulation/CommandParser.java

@@ -39,6 +39,7 @@
 
 package remotesimulation;
 
+import myutil.TraceManager;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -144,11 +145,14 @@ public class CommandParser {
         int cpt = 0;
 
         String cmds[] = cmd.split(" ");
-        //  TraceManager.addDev("cmd " + cmd + " has " + cmds.length + " elements");
+        TraceManager.addDev("cmd " + cmd + " has " + cmds.length + " elements | commandList size:" + commandList.size());
 
         for (SimulationCommand sc : commandList) {
             // Same command name?
+            //TraceManager.addDev("Testing command:" + sc.userCommand + " alias:" + sc.alias);
             if (sc.userCommand.equals(cmds[0]) || sc.alias.equals(cmds[0])) {
+                TraceManager.addDev("Command is valid:" + cmds[0] + ". Now testing parameters. Expected parameters (min/max):" +
+                        sc.getMinNumberOfParameters() + "/" + sc.getMaxNumberOfParameters() + "; size of user parameters: " + (cmds.length-1));
                 // Compatible arguments?
                 if (sc.areParametersCompatible(cmds)) {
                     index = cpt;

src/main/java/ui/interactivesimulation/JFrameTMLSimulationPanelTimeline.java

@@ -92,27 +92,23 @@ public class JFrameTMLSimulationPanelTimeline extends JFrame implements ActionLi
         JComboBox comboBoxUpdateView = new JComboBox<String>(zoomFactor);
         comboBoxUpdateView.setSelectedIndex(2);
 
-        comboBoxUpdateView.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                try {
-                    zoomIndex = (String) comboBoxUpdateView.getSelectedItem();
-                } catch (Exception e) {
-                    //TraceManager.addDev(nbOfTransactions.getText());
-                    //TraceManager.addDev("Invalid default transaction");
-                    zoomIndex = "100%";
-                }
-                sdpanel.getDocument().putProperty("ZOOM_FACTOR", Double.parseDouble(zoomIndex.replace("%",""))/100);
-                TraceManager.addDev("Scale: " + Double.parseDouble(zoomIndex.replace("%",""))/100);
-                if (filePath.length() < 10000) {
-                    sdpanel.setText(filePath);
-                    sdpanel.setCaretPosition(0);
-                    jsp.getVerticalScrollBar().setValue(0);
-                    jsp.getHorizontalScrollBar().setValue(0);
-                }
-                jsp.repaint();
+        comboBoxUpdateView.addActionListener(event -> {
+            try {
+                zoomIndex = (String) comboBoxUpdateView.getSelectedItem();
+            } catch (Exception e) {
+                //TraceManager.addDev(nbOfTransactions.getText());
+                //TraceManager.addDev("Invalid default transaction");
+                zoomIndex = "100%";
+            }
+            sdpanel.getDocument().putProperty("ZOOM_FACTOR", Double.parseDouble(zoomIndex.replace("%",""))/100);
+            TraceManager.addDev("Scale: " + Double.parseDouble(zoomIndex.replace("%",""))/100);
+            if (filePath.length() < 10000) {
+                sdpanel.setText(filePath);
+                sdpanel.setCaretPosition(0);
+                jsp.getVerticalScrollBar().setValue(0);
+                jsp.getHorizontalScrollBar().setValue(0);
             }
+            jsp.repaint();
         });
         northPanel.add(comboBoxUpdateView);
 

src/main/resources/help/diplodocussimulator.html

@@ -12,8 +12,9 @@
     div.column{display: inline-block; vertical-align: top; width: 50%;}
     div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
     ul.task-list{list-style: none;}
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
   </style>
-  <link rel="stylesheet" href="/home/levan/Desktop/TTool/src/main/resources/help/help.css" />
+  <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
@@ -23,7 +24,7 @@
 <h2 id="objective">Objective</h2>
 <p>The simulator of DIPLODOCUS intends to simulate a DIPLODOCUS mapping, taking into account functional tasks, the system architectures (CPU, buses, etc.) and the allocations of tasks and their communucations to the system architecture</p>
 <h2 id="generating-simulation-code-and-commiling-it">Generating simulation code and commiling it?</h2>
-<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the "c++_code" subdirectory of your project.</p>
+<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the “c++_code” subdirectory of your project.</p>
 <p>The second step is to compile the code. You can directly do it from TTool with the code generation window, second tab. Another option is to open a terminal, and to enter the following command:</p>
 <pre><code>$ make</code></pre>
 <h2 id="using-the-simulator-from-ttool">Using the simulator from TTool</h2>
@@ -481,7 +482,7 @@ Not defined: &lt;unknow param&gt;</code></pre>
 <td style="text-align: center;">show-timeline-trace</td>
 <td style="text-align: center;">stlt</td>
 <td style="text-align: center;">7 4</td>
-<td style="text-align: center;">Show the current timeline diagram tracein HTML format</td>
+<td style="text-align: center;">Show the current timeline diagram trace in HTML format</td>
 <td style="text-align: center;">[Type: 2] Task List</td>
 <td style="text-align: center;">[Type: 1] Scale idle time: 0 -&gt; no, 1 -&gt; yes</td>
 <td style="text-align: center;">[Type: 2] Start Time</td>

src/main/resources/help/diplodocussimulator.md

@@ -86,7 +86,7 @@ run-x-time-units | rxtu | 1 6 | Runs the simulation for x units of time | [Type:
 run-x-transactions | rxtr | 1 2 | Runs the simulation for x transactions | [Type: 1] nb of transactions | -  | -  | -  | - 
 save-simulation-state-in-file | sssif | 8 | Saves the current simulation state into a file | [Type: 2] File name | -  | -  | -  | - 
 save-trace-in-file | stif | 7 | Saves the current trace of the simulation in a VCD, HTML, TXT or XML file | [Type: 1] File format: 0-> VCD, 1->HTML, 2->TXT, 3->XML | [Type: 2] File name | -  | -  | - 
-show-timeline-trace | stlt | 7 4 | Show the current timeline diagram tracein HTML format | [Type: 2] Task List | [Type: 1] Scale idle time: 0 -> no, 1 -> yes | [Type: 2] Start Time  | [Type: 2] End Time  | - 
+show-timeline-trace | stlt | 7 4 | Show the current timeline diagram trace in HTML format | [Type: 2] Task List | [Type: 1] Scale idle time: 0 -> no, 1 -> yes | [Type: 2] Start Time  | [Type: 2] End Time  | - 
 set-variable | sv | 5 | Set the value of a variable | [Type: 1] task ID | [Type: 1] variable ID | [Type: 1] variable value | -  | - 
 stop | stop | 15 | Stops the currently running simulation | -  | -  | -  | -  | - 
 write-in-channel | wic | 6 | Writes y samples / events to channel / event x | [Type: 1] Channel ID | [Type: 2] Nb of samples | -  | -  | - 

ttool/src/main/java/Main.java

@@ -48,6 +48,7 @@
 
 import cli.Interpreter;
 import cli.InterpreterOutputInterface;
+import com.microsoft.z3.Version;
 import common.ConfigurationTTool;
 import common.SpecConfigTTool;
 import launcher.RTLLauncher;
@@ -128,6 +129,19 @@ public class Main implements ActionListener, InterpreterOutputInterface{
 
 
         // Starting window
+
+        // Checking Java version
+        if (splashFrame != null) {
+            splashFrame.setMessage("Checking Java version");
+        }
+
+        String s = Version.getFullVersion().toLowerCase();
+        if (s.contains("openjdk")) {
+            System.out.println("** WARNING: you seem to use openjdk as the Java Virtual Machine**.\n " +
+                    "The use of openjdk is strongly discouraged since several graphical bugs have been reported");
+        }
+
+
         // setting default language
         if (splashFrame != null) {
             splashFrame.setMessage("Setting language");