diff --git a/CITATION.cff b/CITATION.cff index 2fa9b05..99d67f1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,7 +11,7 @@ authors: given-names: Ammar orcid: https://orcid.org/0000-0002-8399-8990 title: NanoJava -version: 2.0.4 -date-released: 2025-07-21 +version: 2.0.5 +date-released: 2025-08-16 doi: 10.5281/zenodo.6984324 url: "https://github.com/enanomapper/nanojava" diff --git a/pom.xml b/pom.xml index 3163d7b..1c1f36e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ nanojava Java library extending the Chemistry Development Kit with functionality for nanomaterials. NanoJava - 2.0.4 + 2.0.5 https://github.com/enanomapper/nanojava @@ -87,7 +87,7 @@ com.github.egonw jqudt - 1.5.0 + 1.5.1 com.github.stefanbirkner diff --git a/src/test/java/io/github/egonw/nanojava/appdomain/MeasurementApplicationDomainTest.java b/src/test/java/io/github/egonw/nanojava/appdomain/MeasurementApplicationDomainTest.java index b06c3cd..7f52661 100644 --- a/src/test/java/io/github/egonw/nanojava/appdomain/MeasurementApplicationDomainTest.java +++ b/src/test/java/io/github/egonw/nanojava/appdomain/MeasurementApplicationDomainTest.java @@ -79,4 +79,15 @@ public void testAddRange() throws Exception { assertTrue(domain.inDomain(range3)); } + @Test + public void testAddValue() throws Exception { + IMeasurement range = new MeasurementRange(EndPoints.ZETA_POTENTIAL, 4.5, 6.7, "http://qudt.org/vocab/unit#ElectronVolt"); + IMeasurement range2 = new MeasurementValue(EndPoints.ZETA_POTENTIAL, 7.5, 0.3, "http://qudt.org/vocab/unit#ElectronVolt"); + IMeasurement range3 = new MeasurementRange(EndPoints.ZETA_POTENTIAL, 5.0, 7.0, "http://qudt.org/vocab/unit#ElectronVolt"); + MeasurementApplicationDomain domain = new MeasurementApplicationDomain(); + domain.add(range); + domain.add(range2); + assertTrue(domain.inDomain(range3)); + } + } diff --git a/src/test/java/io/github/egonw/nanojava/manipulator/SubstanceManipulatorTest.java b/src/test/java/io/github/egonw/nanojava/manipulator/SubstanceManipulatorTest.java index f9a0457..5468f49 100644 --- a/src/test/java/io/github/egonw/nanojava/manipulator/SubstanceManipulatorTest.java +++ b/src/test/java/io/github/egonw/nanojava/manipulator/SubstanceManipulatorTest.java @@ -66,4 +66,15 @@ public void testMultipleSizes() throws Exception { assertEquals(2, SubstanceManipulator.getCharacterizations(nm).size()); } + @Test + public void testAsIndentedString_Material() throws Exception { + Material nm = new Material("GRAPHENE"); + nm.addCharacterization(new ErrorlessMeasurementValue(EndPoints.DIAMETER_TEM, 20.0, LengthUnit.NM)); + nm.addCharacterization(new ErrorlessMeasurementValue(EndPoints.DIAMETER_DLS, 55.0, LengthUnit.NM)); + String indented = SubstanceManipulator.asIndentedString(nm); + System.out.println(indented); + assertTrue(indented.contains("