Changeset 61 for proiecte

Timestamp:

Jan 4, 2010, 3:23:54 PM (14 years ago)

Author:

(none)

Message:

modificari 4 ianuarie

File:

• proiecte/ptvs/src/vnsim/core/Engine.java (modified) (6 diffs)

proiecte/ptvs/src/vnsim/core/Engine.java

@@ -242 +242 @@
                         catch (IOException e) 
                         {
-                                System.err.println("Error reading scenario; file error"
-                                                + Globals.inFile);
+                                System.err.println("Error reading scenario; file error"+ Globals.inFile);
                                 e.printStackTrace();
                                 System.exit(0);
@@ -304 +303 @@
                                 }
                                 
+                                // cod comentat deaorece vroiam sa vad daca se calculeaza cum trebuie intersectia cea mai apropiata
+                                // si partea asta face ca semafoarele din toate intersectiile sa genereze evenimente
+                                
                                 /* Szekeres A. START_MODIFY - add broadcast event for each traffic light*/
-                                for(int i=0;i<Globals.map.allIntersections.size();i++) {
+                                /*for(int i=0;i<Globals.map.allIntersections.size();i++) {
                                         Intersection sender = Globals.map.allIntersections.get(i);
                                         if (sender instanceof EmissionsTrafficLight)
                                         {
                                                 ((EmissionsTrafficLight)sender).init();
+                                                System.out.println("add in the queue..");
                                                 schedEvent(new SendEvent(4, (EmissionsTrafficLight)sender, (int)Globals.PROT_TL_FEEDBACK));
                                         }
-                                }                       
+                                }       */              
                                 /* Szekeres A. STOP_MODIFY */
                 }
@@ -662 +665 @@
                         // extrag un eveniment din coada !!!!! acum doar il extrag.. cand intru in playEvent il si scot cu remove(0)
                         Event e = (Event) eventQueue.get(0);
-                        System.out.println("--- no of events in the queue:"+eventQueue.size() );
+                        System.out.println("\n----------- number of events in the queue:"+eventQueue.size() );
                         
                         /**
@@ -715 +718 @@
                                  */
                                 
-                                if(e instanceof SendEvent){
-                                        System.out.print("SendEvent: ");
-                                        processingThreads[indexClosestIntersection] = new SendEventProcessingThread(e,crtTime);
-                                }
-                                else {
-                                        System.out.print("ReceiveEvent: ");
-                                        processingThreads[indexClosestIntersection] = new ReceiveEventProcessingThread(e,crtTime);
-                                }
-                                
                                 // nu e bine cu apelul lui run pt ca practic nu se porneste un thread nou ci 
                                 // se apeleaza metoda run ca orice alta metoda dintr-o clasa, executia este secventiala..
                                 
                                 if (e.getTime() == crtTime) {
+                                
+                                        if(e instanceof SendEvent){             
+                                                
+                                                        System.out.print("SendEvent: ");
+                                                        processingThreads[indexClosestIntersection] = new SendEventProcessingThread(e,crtTime);
+                                                }
+                                        else {                                  
+                                                        System.out.print("ReceiveEvent: ");
+                                                        processingThreads[indexClosestIntersection] = new ReceiveEventProcessingThread(e,crtTime);
+                                                }
+                                        
                                         System.out.println("Processing thread "+indexClosestIntersection+" from intersection "+intersectii.get(indexClosestIntersection));
                                         //processingThreads[indexClosestIntersection].start();// cu start nu merge ... why????
@@ -1351 +1356 @@
                         ReceiveEvent re = (ReceiveEvent) e;
                         ReceiveEvent existing = re.receiver.getReceiveEventForTime(e.getTime());
+                        //getReceiveEventForTime returneaza evenimentele receive petrecute la momentul e.getTime()
+                        
                         if (existing == null){
                                 re.receiver.addReceiveEventForTime(re);
@@ -1359 +1366 @@
                 }
                 
+                // cauta evenimetul in coada, ii gaseste pozitia corecta in lista de evenimente si il adauga 
+                // ce face de fapt? de ce cauta un eveniment si il readauga tot pe el in lista???
                 int idx = Collections.binarySearch(eventQueue, e);
                 synchronized (eventQueue) {