diff --git a/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/GBDT.java b/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/GBDT.java index ff8b1c9..ec8276f 100644 --- a/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/GBDT.java +++ b/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/GBDT.java @@ -615,9 +615,7 @@ private List> loadPandasCategorical(Section section){ String id = section.id(); try { - PandasCategoricalParser parser = new PandasCategoricalParser(id); - - return parser.parsePandasCategorical(); + return PandasUtil.parsePandasCategorical(id); } catch(Exception e){ throw new IllegalArgumentException(id, e); } diff --git a/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasCategoricalParser.java b/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasUtil.java similarity index 73% rename from pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasCategoricalParser.java rename to pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasUtil.java index 17e0204..177705e 100644 --- a/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasCategoricalParser.java +++ b/pmml-lightgbm/src/main/java/org/jpmml/lightgbm/PandasUtil.java @@ -28,23 +28,19 @@ import com.google.gson.JsonParser; import com.google.gson.ToNumberPolicy; -public class PandasCategoricalParser { +public class PandasUtil { - private String string = null; - - - public PandasCategoricalParser(String string){ - setString(string); + private PandasUtil(){ } - public List> parsePandasCategorical(){ - String string = getString(); + static + public List> parsePandasCategorical(String string){ - if(!string.startsWith(PandasCategoricalParser.PREFIX)){ + if(!string.startsWith(PandasUtil.PREFIX_PANDAS_CATEGORICAL)){ throw new IllegalArgumentException(string); } - string = string.substring(PandasCategoricalParser.PREFIX.length()); + string = string.substring(PandasUtil.PREFIX_PANDAS_CATEGORICAL.length()); JsonElement element = JsonParser.parseString(string); @@ -60,17 +56,9 @@ public List> parsePandasCategorical(){ return result; } - public String getString(){ - return this.string; - } - - private void setString(String string){ - this.string = string; - } - static private class ListOfLists extends ArrayList> { } - private static final String PREFIX = "pandas_categorical:"; + public static final String PREFIX_PANDAS_CATEGORICAL = "pandas_categorical:"; } \ No newline at end of file diff --git a/pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasCategoricalParserTest.java b/pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasUtilTest.java similarity index 89% rename from pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasCategoricalParserTest.java rename to pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasUtilTest.java index 791d278..ca48f5f 100644 --- a/pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasCategoricalParserTest.java +++ b/pmml-lightgbm/src/test/java/org/jpmml/lightgbm/PandasUtilTest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; -public class PandasCategoricalParserTest { +public class PandasUtilTest { @Test public void parse() throws Exception { @@ -41,8 +41,6 @@ public void parse() throws Exception { static private List> parsePandasCategorical(String value){ - PandasCategoricalParser parser = new PandasCategoricalParser("pandas_categorical:" + value); - - return parser.parsePandasCategorical(); + return PandasUtil.parsePandasCategorical(PandasUtil.PREFIX_PANDAS_CATEGORICAL + value); } } \ No newline at end of file