unnecessary logging #484 #496

LinguaPhylo · Jun 14, 2024 · acd7586 · acd7586
1 parent e93403c
commit acd7586
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/lphy-studio/src/main/java/lphystudio/core/codecolorizer/DataModelCodeColorizer.java b/lphy-studio/src/main/java/lphystudio/core/codecolorizer/DataModelCodeColorizer.java
@@ -1,6 +1,7 @@
 package lphystudio.core.codecolorizer;
 
 
+import lphy.core.logger.LoggerUtils;
 import lphy.core.model.RandomVariable;
 import lphy.core.model.Value;
 import lphy.core.parser.LPhyParserAction;
@@ -195,10 +196,10 @@ public Object visitRange_list(Range_listContext ctx) {
             TextElement textElement = (TextElement)visit(ctx.getChild(0));
             for (int i = 1; i < ctx.getChildCount(); i++) {
                 TextElement element = (TextElement)visit(ctx.getChild(i));
-                 if (element != null) {
-                     textElement.add(new TextElement(",", punctuationStyle));
-                     textElement.add(element);
-                 }
+                if (element != null) {
+                    textElement.add(new TextElement(",", punctuationStyle));
+                    textElement.add(element);
+                }
             }
             return textElement;
         }
@@ -393,9 +394,9 @@ public Object visitFunction(FunctionContext ctx) {
         @Override
         public Object visitMethodCall(MethodCallContext ctx) {
 
-//            lphystudio.core.codecolorizer.Var var = (Var)visit(ctx.getChild(0));
-//            TextElement e = var.getTextElement(parser, context);
-//            String methodName = ctx.children.get(2).getText();
+            //            lphystudio.core.codecolorizer.Var var = (Var)visit(ctx.getChild(0));
+            //            TextElement e = var.getTextElement(parser, context);
+            //            String methodName = ctx.children.get(2).getText();
 
             String objectName = ctx.children.get(0).getText();
             String methodName = ctx.children.get(2).getText();
@@ -433,7 +434,7 @@ private TextElement getIDElement(String key) {
 
     public Object parse(String CASentence) {
 
-        System.out.println("Parsing " + CASentence + " in code colouriser");
+        LoggerUtils.log.fine("Parsing " + CASentence + " in code colouriser");
 
         // Traverse parse tree
         AbstractParseTreeVisitor visitor = new DataModelASTVisitor();

diff --git a/lphy-studio/src/main/java/lphystudio/core/codecolorizer/LineCodeColorizer.java b/lphy-studio/src/main/java/lphystudio/core/codecolorizer/LineCodeColorizer.java
@@ -1,6 +1,7 @@
 package lphystudio.core.codecolorizer;
 
 
+import lphy.core.logger.LoggerUtils;
 import lphy.core.model.RandomVariable;
 import lphy.core.model.Value;
 import lphy.core.parser.LPhyParserAction;
@@ -170,7 +171,7 @@ public Object visitStoch_relation(Stoch_relationContext ctx) {
 
             return ctx.getText();
         }
-        
+
         @Override
         public Object visitExpression(ExpressionContext ctx) {
             if (ctx.getChildCount() == 1) {
@@ -368,7 +369,7 @@ public Object visitMethodCall(MethodCallContext ctx) {
     }
 
     public Object parse(String CASentence) {
-        System.out.println("Parsing " + CASentence + " in code colouriser");
+        LoggerUtils.log.fine("Parsing " + CASentence + " in code colouriser");
 
         LPhyASTVisitor visitor = new LPhyASTVisitor();
         // no data and model blocks

diff --git a/lphy-studio/src/main/java/lphystudio/core/valueeditor/Abstract2DEditor.java b/lphy-studio/src/main/java/lphystudio/core/valueeditor/Abstract2DEditor.java
@@ -57,7 +57,7 @@ protected void draw2DArray(Object[][] matrix, boolean editable) {
         int maxHeight = preferredElementSize.height * rowCount + GAP * (rowCount + 1);
 
         setMaximumSize(new Dimension(maxWidth, maxHeight));
-        System.out.println("Max size = " + maxWidth + ", " + maxHeight);
+        //        LoggerUtils.log.fine("Max size = " + maxWidth + ", " + maxHeight);
 
     }
 

diff --git a/lphy/src/main/java/lphy/core/simulator/Sampler.java b/lphy/src/main/java/lphy/core/simulator/Sampler.java
@@ -131,10 +131,11 @@ public List<Value> sample(Long seed) {
                 replaceValueInModelDict(value, newValue, variables, sampled);
 
                 // add new Value back to Model Map
-//                addValueToModelDictionary(newValue);
+                //                addValueToModelDictionary(newValue);
             }
         }
-        System.out.println("Resample variable : " + sampled);
+        LoggerUtils.log.info("Resample variable : " + sampled);
+
         if (parserDict.getModelDictionary().size() != nModelDictSize)
             throw new RuntimeException("The number of stored values are not correct in parser model dictionary during resampling !\n" +
                     "It should be " + nModelDictSize + "; but get " + parserDict.getModelDictionary().size());
@@ -206,7 +207,7 @@ public Map<Integer, List<Value>> sampleAll(int numReplicates,
         for (SimulatorListener logger : loggers)
             logger.complete();
 
-//        parser.notifyListeners();
+        //        parser.notifyListeners();
         return valuesAllRepsMap;
     }
 
@@ -267,7 +268,7 @@ private Map<String, Value> getNewlySampledParams(Generator generator, List<Rando
             // but also re-generate its value for the deterministic functions,
             // when its parameter value is changed.
 
-//            if (val.isRandom()) {
+            //            if (val.isRandom()) {
             if (val.isAnonymous() || !sampled.contains(val.getId())) {
                 // re-sample if it has a generator, this will exclude constant Values.
                 // AND this value is NOT generated by the code in the data block.
@@ -277,7 +278,7 @@ private Map<String, Value> getNewlySampledParams(Generator generator, List<Rando
                     Value nv = resample(val, val.getGenerator(), removedRandomValues, sampled);
 
                     newlySampledParams.put(e.getKey(), nv);
-//                    addValueToModelDictionary(nv);
+                    //                    addValueToModelDictionary(nv);
                     // replace old Value with new Value both in Model Map and Value Set
                     replaceValueInModelDict(val, nv, removedRandomValues, sampled);
                 } else {
@@ -289,7 +290,7 @@ private Map<String, Value> getNewlySampledParams(Generator generator, List<Rando
                 String id = e.getValue().getId();
                 newlySampledParams.put(e.getKey(), getParserDictionary().getModelDictionary().get(id));
             }
-//            }
+            //            }
         }
         return newlySampledParams;
     }