warning fixes

jdtuck · Dec 14, 2023 · c396901 · c396901
1 parent 0e7852b
commit c396901
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/gropt/src/LRBFGS.cpp b/src/gropt/src/LRBFGS.cpp
@@ -81,7 +81,7 @@ namespace ROPTLIB{
 		status = YES;
 		Rprintf("isconvex      :%15d[%s],\t", isconvex, status);
 		status = (LengthSY >= 0) ? YES : NO;
-		Rprintf("LengthSY      :%15d[%s]\n", LengthSY, status);
+		Rprintf("LengthSY      :%15ld[%s]\n", LengthSY, status);
 	};
 
 	void LRBFGS::GetSearchDir(void)
@@ -97,7 +97,7 @@ namespace ROPTLIB{
 
 	void LRBFGS::PrintInfo(void)
 	{
-		Rprintf("\n\tbetay:%.3e,rho:%.3e,gamma:%.3e,inpss:%.3e,inpsy:%.3e,inpyy:%.3e,IsUpdateHessian:%ld,", betay, rho, gamma, inpss, inpsy, inpyy, isupdated);
+		Rprintf("\n\tbetay:%.3e,rho:%.3e,gamma:%.3e,inpss:%.3e,inpsy:%.3e,inpyy:%.3e,IsUpdateHessian:%d,", betay, rho, gamma, inpss, inpsy, inpyy, isupdated);
 		Rprintf("\n");
 	};
 }; /*end of ROPTLIB namespace*/
diff --git a/src/gropt/src/LRTRSR1.cpp b/src/gropt/src/LRTRSR1.cpp
@@ -508,7 +508,7 @@ namespace ROPTLIB{
 		status = YES;
 		Rprintf("isconvex      :%15d[%s],\t", isconvex, status);
 		status = (LengthSY >= 0) ? YES : NO;
-		Rprintf("LengthSY      :%15d[%s]\n", LengthSY, status);
+		Rprintf("LengthSY      :%15ld[%s]\n", LengthSY, status);
 	};
 
 	void LRTRSR1::HessianEta(Vector *Eta, Vector *result)
@@ -538,7 +538,7 @@ namespace ROPTLIB{
 
 	void LRTRSR1::PrintInfo(void)
 	{
-		Rprintf("\n\tgamma:%.3e,inpss:%.3e,inpsy:%.3e,inpyy:%.3e,IsUpdateHessian:%ld,", gamma, inpss, inpsy, inpyy, isupdated);
+		Rprintf("\n\tgamma:%.3e,inpss:%.3e,inpsy:%.3e,inpyy:%.3e,IsUpdateHessian:%d,", gamma, inpss, inpsy, inpyy, isupdated);
 		Rprintf("\n");
 	};
 }; /*end of ROPTLIB namespace*/
diff --git a/src/gropt/src/Manifold.cpp b/src/gropt/src/Manifold.cpp
@@ -420,8 +420,8 @@ namespace ROPTLIB{
 		Rprintf("GENERAL PARAMETERS:\n");
 		Rprintf("name          :%15s,\t", name.c_str());
 		Rprintf("IsIntrApproach:%15d\n", IsIntrApproach);
-		Rprintf("IntrinsicDim  :%15d,\t", IntrinsicDim);
-		Rprintf("ExtrinsicDim  :%15d\n", ExtrinsicDim);
+		Rprintf("IntrinsicDim  :%15ld,\t", IntrinsicDim);
+		Rprintf("ExtrinsicDim  :%15ld\n", ExtrinsicDim);
 		Rprintf("HasHHR        :%15d,\t", HasHHR);
 		Rprintf("UpdBetaAlone  :%15d\n", UpdBetaAlone);
 		Rprintf("HasLockCon    :%15d\n", HasLockCon);
@@ -582,7 +582,7 @@ namespace ROPTLIB{
 			}
 			else
 			{
-				Rprintf("beta: %ld\n", 1);
+				Rprintf("beta: %d\n", 1);
 			}
 			Rprintf("|xix| / |T_{etax} xix|:%g\n", sqrt(Metric(x, inxix, inxix) / Metric(x, inzetax, inzetax)));
 			ScaleTimesVector(x, sqrt(Metric(x, inxix, inxix) / Metric(x, inzetax, inzetax)),
@@ -608,7 +608,7 @@ namespace ROPTLIB{
 			}
 			else
 			{
-				Rprintf("beta: %ld\n", 1);
+				Rprintf("beta: %d\n", 1);
 			}
 			Rprintf("|xix| / |T_{etax} xix|:%g\n", sqrt(Metric(x, xix, xix) / Metric(x, zetax, zetax)));
 			ScaleTimesVector(x, sqrt(Metric(x, xix, xix) / Metric(x, zetax, zetax)),

diff --git a/src/gropt/src/RNewton.cpp b/src/gropt/src/RNewton.cpp
@@ -62,7 +62,7 @@ namespace ROPTLIB{
 		Rprintf("theta         :%15g[%s],\t", theta, status);
 		status = (kappa > 0 && kappa < 1) ? YES : NO;
 		Rprintf("kappa         :%15g[%s]\n", kappa, status);
-		Rprintf("useRand       :%15ld[%s]\n", useRand, status);
+		Rprintf("useRand       :%15d[%s]\n", useRand, status);
 	};
 
 	RNewton::~RNewton(void)

diff --git a/src/gropt/src/SolversLS.cpp b/src/gropt/src/SolversLS.cpp
@@ -748,7 +748,7 @@ namespace ROPTLIB{
 		if (LineSearch_LS == INPUTFUN)
 		{
 			status = YES;
-			Rprintf("IsPureLSInput :%15ld[%s]\n", IsPureLSInput, status);
+			Rprintf("IsPureLSInput :%15d[%s]\n", IsPureLSInput, status);
 		}
 	};
 

diff --git a/src/gropt/src/SolversTR.cpp b/src/gropt/src/SolversTR.cpp
@@ -246,9 +246,9 @@ namespace ROPTLIB{
 		status = (maximum_Delta > 0 && maximum_Delta >= minimum_Delta) ? YES : NO;
 		Rprintf("maximum_Delta :%15g[%s]\n", maximum_Delta, status);
 		status = (Min_Inner_Iter >= 0 && Min_Inner_Iter <= Max_Inner_Iter) ? YES : NO;
-		Rprintf("Min_Inner_Iter:%15d[%s],\t", Min_Inner_Iter, status);
+		Rprintf("Min_Inner_Iter:%15ld[%s],\t", Min_Inner_Iter, status);
 		status = (Max_Inner_Iter >= 0 && Max_Inner_Iter >= Min_Inner_Iter) ? YES : NO;
-		Rprintf("Max_Inner_Iter:%15d[%s],\n", Max_Inner_Iter, status);
+		Rprintf("Max_Inner_Iter:%15ld[%s],\n", Max_Inner_Iter, status);
 		status = (theta >= 0) ? YES : NO;
 		Rprintf("theta         :%15g[%s],\t", theta, status);
 		status = (kappa > 0 && kappa < 1) ? YES : NO;