Merge pull request #659 from veg/2.3.5

Xcode 9 compatibility
veg · Oct 5, 2017 · 9e7445b · 9e7445b
2 parents 98976b2 + a49b7a6
commit 9e7445b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/batchlan.cpp b/src/core/batchlan.cpp
@@ -2913,7 +2913,7 @@ void      _ElementaryCommand::ExecuteCase11 (_ExecutionList& chain)
                      *tree   = (_String*)(*likelihoodFunctionSpec)(i+1),
                       *freq    = explicitFreqs?(_String*)(*likelihoodFunctionSpec)(i+2):nil;
 
-        if(GetDataFilter (AppendContainerName(*dataset,chain.nameSpacePrefix)) >= 0) {
+        if(GetDataFilter (AppendContainerName(*dataset,chain.nameSpacePrefix)) != nil) {
             _TheTree*   thisTree = (_TheTree*)FetchObjectFromVariableByType(&AppendContainerName(*tree,chain.nameSpacePrefix),TREE);
             if (thisTree) {
                 _TreeIterator ti (thisTree, _HY_TREE_TRAVERSAL_POSTORDER);

diff --git a/src/new/bayesgraph.cpp b/src/new/bayesgraph.cpp
@@ -327,7 +327,7 @@ _BayesianGraphicalModel::_BayesianGraphicalModel (_AssociativeList * nodes)
         if ((avl_val = (_Constant *) (this_avl->GetByKey (_HYBgm_PRIOR_PRECISION, NUMBER)))) {
             prior_precision.Store (node, 0, (_Parameter) (avl_val->Value()));
 
-            if (avl_val <= 0) {
+            if (avl_val->Value() <= 0.) {
                 errorMessage = _String ("PriorPrecision must be greater than zero, received ") & prior_precision(node,0) & " for node " & node;
                 break;
             }
@@ -342,7 +342,7 @@ _BayesianGraphicalModel::_BayesianGraphicalModel (_AssociativeList * nodes)
         if ((avl_val = (_Constant *) (this_avl->GetByKey (_HYBgm_PRIOR_SCALE, NUMBER)))) {
             prior_scale.Store (node, 0, (_Parameter) (avl_val->Value()));
 
-            if (avl_val <= 0) {
+            if (avl_val->Value() <= 0.) {
                 errorMessage = _String ("PriorScale must be greater than zero, received ") & prior_scale(node,0) & " for node " & node;
                 break;
             }