Browse Source

CuDD is actually called CUDD

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10485 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Joachim Klein 11 years ago
parent
commit
eecc87786a
  1. 4
      prism/src/dd/dd_cudd.cc
  2. 8
      prism/src/jdd/JDD.java
  3. 2
      prism/src/prism/PrismCL.java
  4. 2
      prism/src/userinterface/GUIComputationThread.java

4
prism/src/dd/dd_cudd.cc

@ -31,7 +31,7 @@
extern FILE *dd_out;
// A flag indicating that a CuDD error has occurred
// A flag indicating that a CUDD error has occurred
// that could not be signalled by returning a NULL DdNode*
// from a function
bool dd_cudd_error_flag = false;
@ -239,7 +239,7 @@ bool DD_GetErrorFlag(DdManager *ddman)
//-----------------------------------------------------------------------------------
// Set the DD error flag. Should be set if a CuDD error has been
// Set the DD error flag. Should be set if a CUDD error has been
// detected that could not be signalled by returning a NULL DdNode*
// from the function
void DD_SetErrorFlag()

8
prism/src/jdd/JDD.java

@ -123,11 +123,11 @@ public class JDD
private static native void DD_ExportMatrixToSpyFile(long dd, long rvars, int num_rvars, long cvars, int num_cvars, int depth, String filename);
/**
* An exception indicating that CuDD ran out of memory or that another internal error
* An exception indicating that CUDD ran out of memory or that another internal error
* occurred.
* <br>
* This exception is thrown by ptrToNode if a NULL pointer is returned by one of the native
* DD methods. It is generally not safe to use the CuDD library after this error occurred,
* DD methods. It is generally not safe to use the CUDD library after this error occurred,
* so the program should quit as soon as feasible.
*/
public static class CuddOutOfMemoryException extends RuntimeException {
@ -135,7 +135,7 @@ public class JDD
/** Constructor */
CuddOutOfMemoryException() {
super("The MTBDD library CuDD seems to have run out of memory or encountered an internal error.");
super("The MTBDD library CUDD seems to have run out of memory or encountered an internal error.");
}
}
@ -1399,7 +1399,7 @@ public class JDD
/**
* Check whether the DD error flag is set, indicating an
* out-of-memory situation in CuDD or another internal error.
* out-of-memory situation in CUDD or another internal error.
* If the flag is set, throws a {@code CuddOutOfMemoryException}.
*/
public static void checkForCuddError()

2
prism/src/prism/PrismCL.java

@ -205,7 +205,7 @@ public class PrismCL implements PrismModelListener
run(args);
} catch (jdd.JDD.CuddOutOfMemoryException e) {
mainLog.println("\nError: " + e.getMessage());
mainLog.println(" Try to restart PRISM and increase the memory available to CuDD using the -cuddmaxmem argument.\n");
mainLog.println(" Try to restart PRISM and increase the memory available to CUDD using the -cuddmaxmem argument.\n");
mainLog.println(" Stack trace for the failed method:");
for (StackTraceElement st : e.getStackTrace()) {
mainLog.print(" ");

2
prism/src/userinterface/GUIComputationThread.java

@ -54,7 +54,7 @@ public class GUIComputationThread extends Thread
public void error(Exception e)
{
if (e instanceof jdd.JDD.CuddOutOfMemoryException) {
error(e.getMessage()+"\nPlease restart PRISM. You can increase the memory for CuDD in the settings...");
error(e.getMessage()+"\nPlease restart PRISM. You can increase the memory for CUDD in the settings...");
} else if (e instanceof PrismException) {
error(e.getMessage());
} else {

Loading…
Cancel
Save