more merge bug fixes

beast-dev · Nov 16, 2023 · 679e304 · 679e304
1 parent 253178d
commit 679e304
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...omodel/treedatalikelihood/continuous/RepeatedMeasuresIntegratedProcessTraitDataModel.java b/...omodel/treedatalikelihood/continuous/RepeatedMeasuresIntegratedProcessTraitDataModel.java
@@ -87,6 +87,11 @@ public int getTraitDimension() {
         return dimProcess;
     }
 
+    @Override
+    public boolean isIntegratedProcess() {
+        return true;
+    }
+
     @Override
     protected int getParameterPartialDimension() {
         return 2 * getParameter().getDimension();

diff --git a/src/dr/evomodelxml/treedatalikelihood/ContinuousDataLikelihoodParser.java b/src/dr/evomodelxml/treedatalikelihood/ContinuousDataLikelihoodParser.java
@@ -177,7 +177,7 @@ public Object parseXMLObject(XMLObject xo) throws XMLParseException {
             }
         }
 
-        boolean integratedProcess = dataModel instanceof IntegratedProcessTraitDataModel; //TODO: can add to interface if that would be better
+        boolean integratedProcess = dataModel.isIntegratedProcess();
 
         if (delegateProvider == DelegateProvider.OU) {
             if (!integratedProcess) {