#define PRINT(fmt,args) { FILE *fp = fopen("R:\\Simantics\\Sysdyn\\log.txt", "ab"); fprintf(fp, fmt, args); fclose(fp); }
-#include <direct.h>
-#define GetCurrentDir _getcwd
-
using namespace std;
struct FMI1 {
JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_loadFMUFile_1
(JNIEnv *env, jobject obj, jstring path, jstring tempDir) {
- HMODULE module = NULL;
FMI1 fmi1;
FMIL_Variable *vars;
FMIL_DeclaredType *types;
jsize n = env -> GetArrayLength(result);
int *vrs;
const char *error = "";
- int returnValue = 0;
FMI1 fmi = fmus[id];
if(n > 0) {
int returnValue;
const char *error = "";
- FMI1 fmi = fmus[id];
+ FMI1 &fmi = fmus[id];
if (fmi.version == 1) {
returnValue = FMI1_CS_INSTANTIATE(fmi.fmu, "", &error);
} else if (fmi.version == 2) {
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].variables.size();i++) {
+ for(unsigned int i=0;i<fmus[id].variables.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].variables[i].c_str()));
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].descriptions.size();i++) {
+ for(unsigned int i=0;i<fmus[id].descriptions.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].descriptions[i].c_str()));
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].declaredTypes.size();i++) {
+ for(unsigned int i=0;i<fmus[id].declaredTypes.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].declaredTypes[i].c_str()));
}
jint* resultElements = env -> GetIntArrayElements(result, &isCopy);
jsize n = env -> GetArrayLength(result);
- int i;
- for (i = 0; i < n; i++) {
+ for (jsize i = 0; i < n; i++) {
resultElements[i] = fmus[id].variabilities[i];
}
jint* resultElements = env -> GetIntArrayElements(result, &isCopy);
jsize n = env -> GetArrayLength(result);
- int i;
- for (i = 0; i < n; i++) {
+ for (jsize i = 0; i < n; i++) {
resultElements[i] = fmus[id].causalities[i];
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].declaredTypeNames.size();i++) {
+ for(unsigned int i=0;i<fmus[id].declaredTypeNames.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].declaredTypeNames[i].c_str()));
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].typeDescriptions.size();i++) {
+ for(unsigned int i=0;i<fmus[id].typeDescriptions.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].typeDescriptions[i].c_str()));
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].quantities.size();i++) {
+ for(unsigned int i=0;i<fmus[id].quantities.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].quantities[i].c_str()));
}
env->FindClass("java/lang/String"),
env->NewStringUTF(""));
- for(int i=0;i<fmus[id].units.size();i++) {
+ for(unsigned int i=0;i<fmus[id].units.size();i++) {
env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].units[i].c_str()));
}
int returnValue;
const char *error = "";
- FMI1 fmi = fmus[id];
+ FMI1 &fmi = fmus[id];
if (fmi.version == 1) {
returnValue = FMI1_CS_STEP(fmi.fmu, fmi.currentTime, fmi.timeStep, &error);
} else if (fmi.version == 2) {
*/
return 0;
-}
\ No newline at end of file
+}