major update.

NeelPatel21 · NeelPatel21 · commit 600cb892ba00 · 2017-02-18T22:01:21.000+05:30
add support for parallel execution.
more configuration options.
MemoryOutOfBoundsError solved.
diff --git a/ProgramTesterUser.jar b/ProgramTesterUser.jar
diff --git a/config.txt b/config.txt
@@ -3,4 +3,6 @@ problem_dir :- resources\ProbDef\
 source_data_dir :- resources\Data\
 local_logger_dir :- resources\temp\log\
 network_logger_ip :- 127.0.0.1
-network_logger_port :- 8686
+network_logger_port :- 8686
+#parallel_execution :- false
+parallel_thread :- 2
diff --git a/gmon.out b/gmon.out
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -5,9 +5,11 @@
         <group>
             <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/ui/cli/CliUser.java</file>
             <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/programtester/ProgramTester.java</file>
-            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/userModule/IntUserFlow.java</file>
-            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/ui/IntUI.java</file>
-            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/userModule/result/IntProgramState.java</file>
+            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/runTest/RunTest.java</file>
+            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/userModule/SingleUserFlow.java</file>
+            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/programtester/config/Configurator.java</file>
+            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/userModule/test/Test.java</file>
+            <file>file:/C:/My%20folder/Fun/Data/Program%20Tester/src/lib/dT/manipulate/comparators/StringComparators.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/resources/ProbDef/170215054628_Write a program to check whether the entered strings are palindrome or not..txt b/resources/ProbDef/170215054628_Write a program to check whether the entered strings are palindrome or not..txt
@@ -2,6 +2,7 @@
 170215054628
 @title
 Write a program to check whether the entered strings are palindrome or not.
+@description
 Palindrome strings are the ones that are read same if reversed (By example, rar is rar if reversed).
 make a program to determine that the string is palindrome or not.
 Write a program to check whether the entered strings are palindrome or not.
diff --git a/resources/gmon.out b/resources/gmon.out
diff --git a/resources/prop.c b/resources/prop.c
@@ -12,7 +12,7 @@ void main()
 		scanf("%d",&s[i]);
 	merge(&s[0],l);
 	for(i=0;i<l;i++)
-		printf("%d45\n\n",s[i]);
+		printf("%d \n\n",s[i]);
 }
 void merge(long *a,long i)
 {
diff --git a/resources/prop.exe b/resources/prop.exe
diff --git a/src/lib/dT/manipulate/comparators/ListManipulator.java b/src/lib/dT/manipulate/comparators/ListManipulator.java
@@ -37,8 +37,10 @@ public static boolean compare(List<String>o1,List<String>o2,
                }
           }catch(NoSuchElementException e){
                return false;
+          }finally{
+               System.gc();
           }
-          return false; 
+          return false;
      }
      
      /**
@@ -55,7 +57,7 @@ public static boolean compare(List<String>o1,List<String>o2,
         from {@code li}.
       */
      public static List<String> removeNull(List<String> li){
-          return li.stream().filter(s->s!=null&&s!="")
+          return li.stream().filter(s->!s.trim().isEmpty())
                     .collect(Collectors.toList());
      }
      
diff --git a/src/lib/runTest/ProgramExecuter.java b/src/lib/runTest/ProgramExecuter.java
@@ -12,12 +12,12 @@
 class ProgramExecuter {
      boolean executed=false;
      String cmd;
-     ProcessBuilder pb; //used to create subprocess
+     //ProcessBuilder pb; //used to create subprocess
      Process pr; //refer to the subprocess
      Thread tin,tout; //refer to the thread which give input and output
      List<String> input; //input of subprocess
      List<String> output; //output of subprocess
-     Scanner sc; //Scanner bind to standard outputStream and error stream
+     //Scanner sc; //Scanner bind to standard outputStream and error stream
      long time=-1; //time taken by subprocess in milli secounds.
      BufferedReader in;
      PrintWriter out; //bind to standard input stream of subprocess.
@@ -31,8 +31,8 @@ class ProgramExecuter {
      ProgramExecuter(List<String> input,String cmd){
           this.input=input;
           this.cmd=cmd;
-          pb=new ProcessBuilder(cmd);
-          pb.redirectErrorStream(true); //error stream bind with the output steam of subprocess
+          //pb=new ProcessBuilder(cmd);
+          //pb.redirectErrorStream(true); //error stream bind with the output steam of subprocess
           output=new ArrayList<>();
      }
      
@@ -57,10 +57,10 @@ synchronized List<String> execute(long time) throws IOException{
           pr=Runtime.getRuntime().exec(cmd);
           //pr=pb.start(); //start new subprocess.
           //System.out.println("ProgramExecuter.execute :- started");
-          //in=new BufferedReader(new InputStreamReader(pr.getInputStream()));
+          in=new BufferedReader(new InputStreamReader(pr.getInputStream()));
           //in=new BufferedReader(new InputStreamReader(new FileInputStream("input.txt")));
           out=new PrintWriter(new BufferedOutputStream(pr.getOutputStream()));
-          sc=new Scanner(pr.getInputStream());
+          //sc=new Scanner(pr.getInputStream());
           tin=new Thread(this::giveIn); //create thread to give input to subprocess 
           tout=new Thread(this::getOut); //create thread to get output of subprocess
           tout.start();
@@ -91,8 +91,12 @@ void stop(){
                pr.destroyForcibly();
           }
           if(tin!=null&&tin.isAlive()){
-               sc.close();
-               //tin.destroy();
+               try {
+                    //sc.close();
+                    in.close();
+                    //tin.destroy();
+               } catch (IOException ex) {
+               }
           }
           if(tout!=null&&tout.isAlive()){
                //tout.destroy();
@@ -133,17 +137,18 @@ private void giveIn(){
      private void getOut(){
           //System.out.println("ProgramExecuter.getOut :- started");
           //for(;pr.isAlive();){
-          //in.lines().forEach(s->output.add(s));
-          sc.forEachRemaining(s->{
+          in.lines().limit(200000).forEach(s->output.add(s));
+          /*sc.forEachRemaining(s->{
                try{
                     //String s=in.readLine();
                     output.add(s);
                     //System.out.println("ProgramExecuter.getout :- get out "+s);
                }catch(NoSuchElementException ex){
                     //System.out.println(ex);
                }
-          });
+          });*/
           //System.out.println("ProgramExecuter.getOut : - ended");
+          //System.gc();
      }
      
      /**return runtime of subprocess in milli seconds.
diff --git a/src/lib/userModule/SingleUserFlow.java b/src/lib/userModule/SingleUserFlow.java
@@ -76,13 +76,16 @@ private void update(Test t){
           IntResultSet rs=t.getIntResultSet();
           ProblemState x=ps.stream().filter(i->i.getProgramID()==t.getProgramID())
                   .findAny().get();
-          if(rs.getAllResult().stream().allMatch(i->i.getMessageCode()>0)){
-               x.setState(1);
+          int code=rs.getAllResult().stream().mapToInt(r->r.getMessageCode())
+                  .min().orElse(0);
+          if(code>x.getState()){
+               x.setState(code);
           }
           if(logger!=null)
                logger.log("DateTime = "+LocalDateTime.now()
                ,"PID = "+x.getProgramID()
                ,"State = "+x.getState());
+          System.gc();
      }
      
      /**
@@ -142,7 +145,7 @@ public IntLiveResultSet execute(long pid,String cmd) {
                es.submit(()->update(t));
                return rt;
           } catch (IOException ex) {
-               System.out.println("Error");
+               ui.showMessage("file not found !!!");
           }
           return null;
      }
diff --git a/src/lib/userModule/test/Test.java b/src/lib/userModule/test/Test.java
@@ -29,7 +29,9 @@
  */
 public class Test {
 //static Part
-     
+     public static final int TEST_PASS=2,TEST_PRESENT_ERROR=1,TEST_FAIL=-2,
+             TEST_TIME_ERROR=-1,TEST_FILE_ERROR=-3;
+     public static long minMem=20000000;
      /* 
      * defDir is default path veriable which is used by construtor if no path
        provided explicitly.
@@ -40,6 +42,16 @@ public class Test {
      //lock on defDir
      static final private ReentrantReadWriteLock ldefDir=new ReentrantReadWriteLock();
      
+     /* 
+     * defDir is default path veriable which is used by construtor if no path
+       provided explicitly.
+     * it should only accessed by getter and setter methods only.
+     */
+     static private boolean isParallel=true;
+     
+     //lock on defDir
+     static final private ReentrantReadWriteLock lIsParallel=new ReentrantReadWriteLock();
+     
      /**
       * getter method of default path.
       * it is used by constructor if the path is not provided explicitly.
@@ -79,6 +91,40 @@ static public boolean setDefaultDir(Path p){
                ldefDir.writeLock().unlock();
           }
      }
+     
+     
+     /**
+      * getter method of default execution method.
+      * it is used by default.
+      * this method is thread safe.
+      * @return default execution method.
+      */
+     static public boolean getIsParallel(){
+          try{
+               lIsParallel.readLock().lock();
+               return isParallel;
+          }
+          finally{
+               lIsParallel.readLock().unlock();     
+          }
+     }
+     
+     /**
+      * setter method of default execution method.
+      * this method is thread safe.<br>
+      * @param isParallel if the execution method is parallel or not.
+      */
+     static public void setIsParallel(boolean isParallel){
+          try{
+               if(getIsParallel()==isParallel)
+                    return;
+               lIsParallel.writeLock().lock();
+               Test.isParallel=isParallel;
+               return;
+          }finally{
+               lIsParallel.writeLock().unlock();
+          }
+     }
 
 //local Part     
      private final Path dir;
@@ -104,31 +150,35 @@ private void comp(TestState us){
                if(!us.isExecuted())
                     return;
                if(us.getTime()<0){
-                    us.setState("Time Limit Exceeded", -2);
+                    us.setState("Time Limit Exceeded",TEST_TIME_ERROR);
                     return;
                }
                IntIODetail ori=read(us.index());
+               if(ori==null)
+                    us.setState("File Not Found !!", TEST_FILE_ERROR);
                //System.out.println("enter check");
                if(ListManipulator.compare(us.getAllOutput(),ori.getAllOutput(),
                               StringComparators.getExactmatch())){
                     //System.out.println("perfect check");
-                    us.setState("Pass",1);
+                    us.setState("Pass",TEST_PASS);
                }
-               else if(ListManipulator.compare(us.getAllOutput(),ori.getAllOutput(),
+               else if(ListManipulator.compare(
+                       ListManipulator.removeNull(us.getAllOutput()),
+                       ListManipulator.removeNull(ori.getAllOutput()),
                               StringComparators.getIgnoreWhiteSpace())){
                     //System.out.println("persentation check");
-                    us.setState("Presentation Error",2);
+                    us.setState("Presentation Error",TEST_PRESENT_ERROR);
                }
                else {
-                    us.setState("Fail", -1);
+                    us.setState("Fail",TEST_FAIL);
                }
           }catch(NullPointerException ex){
                throw new IllegalArgumentException();
           }
      }
      
      private synchronized void reader()throws IOException{
-          List<TestState> ts=IntStream.rangeClosed(1,20)
+          List<TestState> ts=IntStream.rangeClosed(1,30)
                               .mapToObj(i->read(i))
                               .filter(i->i!=null)
                               //.peek(i->System.out.println("index :- "+i.index()))
@@ -159,12 +209,46 @@ private void run(){
           for(TestState i:ts){
                if(!flag) //check if the thread should be terminated.
                     break;
+               for(;Runtime.getRuntime().freeMemory()<minMem&&
+                       minMem*2<Runtime.getRuntime().maxMemory();){
+                    try{
+                         System.gc();
+                         Thread.sleep(1000);
+                    }catch(InterruptedException e){}
+               }
                RunTest rt=new RunTest(i,cmd);
                i.setState("Executing", 0);
                i.update(rt.getIODetail());
                comp(i);
                i.makeFinal();
           }
+          //System.gc();
+     }
+     
+     private void run(boolean isParallel){
+          if(!isParallel){
+               run();
+               return;
+          }
+          flag=true;
+          ts.parallelStream().peek(i->{
+               if(!flag) //check if the thread should be terminated.
+                    return;
+               for(;Runtime.getRuntime().freeMemory()<minMem&&
+                       minMem*2<Runtime.getRuntime().maxMemory();){
+                    //System.out.println("jbahbajadk");
+                    try{
+                         System.gc();
+                         Thread.sleep(1000);
+                    }catch(InterruptedException e){}
+               }
+               RunTest rt=new RunTest(i,cmd);
+               i.setState("Executing", 0);
+               i.update(rt.getIODetail());
+               comp(i);
+               i.makeFinal();
+               System.gc();
+          }).count();
      }
      
      /**
@@ -192,7 +276,7 @@ public synchronized IntLiveResultSet start() throws IOException{
           if(t!=null)
                return null;
           reader();
-          t=new Thread(this::run,"Tester Thread");
+          t=new Thread(()->run(getIsParallel()),"Tester Thread");
           t.start();
           lrs=new LiveResultSetAdapter(ts);
           return lrs;
diff --git a/src/programtester/ProgramTester.java b/src/programtester/ProgramTester.java
@@ -20,12 +20,13 @@ public class ProgramTester {
       * @param args the command line arguments
       */
      public static void main(String[] args) {
-          //mainUserCli();
-          mainAdminCli();
+          mainUserCli();
+          //mainAdminCli();
      }
      
      public static void mainUserCli(){
           Configurator.init();
+          
           //Test.setDefaultDir(Paths.get("Data").toAbsolutePath());
           //System.out.println("Working Directory = " +System.getProperty("user.dir"));
           //System.out.println("Data Directory = " +Test.getDefaultDir());
diff --git a/src/programtester/config/Configurator.java b/src/programtester/config/Configurator.java
@@ -10,8 +10,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import lib.dT.problemManipulate.ProgramDetails;
 import lib.logger.LocalLogger;
 import lib.userModule.test.Test;
@@ -70,6 +68,18 @@ private static void proc(String s){
                     break;
                case "network_logger_ip":
                     break;
+               case "parallel_execution":
+                    boolean b=Boolean.parseBoolean(ar[1]);
+                    Test.setIsParallel(b);
+                    break;
+               case "parallel_thread":
+                    try{
+                         int i=Integer.parseInt(ar[1]);
+                         System.setProperty("java.util.concurrent.ForkJoinPool"
+                                 + ".common.parallelism",""+i);
+                         
+                    }catch(NumberFormatException e){}
+                    break;
                case "network_logger_port":
                     break;
                     

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ void main()`
`12`	`12`	`scanf("%d",&s[i]);`
`13`	`13`	`merge(&s[0],l);`
`14`	`14`	`for(i=0;i<l;i++)`
`15`		`- printf("%d45\n\n",s[i]);`
	`15`	`+ printf("%d \n\n",s[i]);`
`16`	`16`	`}`
`17`	`17`	`void merge(long *a,long i)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@ public static boolean compare(List<String>o1,List<String>o2,`
`37`	`37`	`}`
`38`	`38`	`}catch(NoSuchElementException e){`
`39`	`39`	`return false;`
	`40`	`+ }finally{`
	`41`	`+ System.gc();`
`40`	`42`	`}`
`41`		`- return false;`
	`43`	`+ return false;`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`/**`
`@@ -55,7 +57,7 @@ public static boolean compare(List<String>o1,List<String>o2,`
`55`	`57`	`from {@code li}.`
`56`	`58`	`*/`
`57`	`59`	`public static List<String> removeNull(List<String> li){`
`58`		`- return li.stream().filter(s->s!=null&&s!="")`
	`60`	`+ return li.stream().filter(s->!s.trim().isEmpty())`
`59`	`61`	`.collect(Collectors.toList());`
`60`	`62`	`}`
`61`	`63`