Changed info screen

sdcTools · Jun 26, 2018 · 6ed5034 · 6ed5034
1 parent 0ada4c2
commit 6ed5034
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -18,8 +18,8 @@ ifeq ($(PLATFORM),Linux)
 	JAVADIR = /home/argus/jdk1.7.0_25
 else
 	GNUDIR  = C:/mingw/bin
-	SWIGDIR = E:/W7/Users/Peter-Paul/MyDocuments/Thuiswerk/Programmatuur/swigwin-3.0.12
-	JAVADIR = C:/Progra~2/Java/jdk1.7.0_51
+	SWIGDIR = C:/swigwin-3.0.10
+	JAVADIR = C:/Progra~2/Java/jdk1.7.0_80
 endif
 
 LIBNAME       = TauArgusJava

diff --git a/TauArgus.cpp b/TauArgus.cpp
@@ -5868,12 +5868,12 @@ bool TauArgus::testampl(long ind)
 /**
  * Determines the noise to be added in a frequency count table, according to the 
  * cell key method with probabilities in the p-table
- * @param TabNo         table in tabeset to be protected
+ * @param TabNo         table in tableset to be protected
  * @param PTableFile    name of file containing information on p-table
  * @return              maximum amount of noise (absolute value)
  */
 
-int TauArgus::SetCellKeyValues(long TabNo, const char* PTableFile){
+int TauArgus::SetCellKeyValues(long TabNo, const char* PTableFile, int *MinDiff, int *MaxDiff){
     CDataCell *dc;
     int RowNr, Diff;
     PTable ptable;
@@ -5889,15 +5889,22 @@ int TauArgus::SetCellKeyValues(long TabNo, const char* PTableFile){
 
     for (long i=0; i < m_tab[TabNo].nCell; i++){
         dc = m_tab[TabNo].GetCell(i);
-        RowNr = (dc->GetResp() >= ptable.GetmaxNi()) ? ptable.GetmaxNi() : (int) dc->GetResp();
-        row = ptable.GetData()[RowNr];
-        Diff = 0;
-        for (pos=row.begin();pos!=row.end();++pos){
-            Diff = pos->first - RowNr;
-            if (dc->GetCellKey() < pos->second) break;
+        if (dc->GetStatus() != CS_PROTECT_MANUAL){
+            RowNr = (dc->GetResp() >= ptable.GetmaxNi()) ? ptable.GetmaxNi() : (int) dc->GetResp();
+            row = ptable.GetData()[RowNr];
+            Diff = 0;
+            for (pos=row.begin();pos!=row.end();++pos){
+                Diff = pos->first - RowNr;
+                if (dc->GetCellKey() < pos->second) break;
+            }
+            dc->SetCKMValue((double) (dc->GetResp() + Diff));
+        }
+        else{
+            dc->SetCKMValue((double) (dc->GetResp()));
         }
-        dc->SetCKMValue((double) (dc->GetResp() + Diff));
     }
 
-    return std::max(std::abs(ptable.GetminDiff()), std::abs(ptable.GetmaxDiff()));
+    MinDiff[0] = ptable.GetminDiff();
+    MaxDiff[0] = ptable.GetmaxDiff();
+    return 1;
 }
diff --git a/TauArgus.h b/TauArgus.h
@@ -282,7 +282,7 @@ class TauArgus
 	long GetMaxnUc();
 	bool ExploreFile(/*[in]*/ const char* FileName, /*[in,out]*/ long * ErrorCode,  /*[in,out]*/ long * LineNumber, /*[in,out]*/ long * ErrorVarIndex);
 	bool UnsafeVariable( /*[in]*/ long VarIndex,/*[in,out]*/ long *Count, /*[in,out]*/ long * UCArray);
-	bool GetTableRow( /*[in]*/ long TableIndex, /*[in,out]*/ long * DimIndex, /*[in,out]*/ double * Cell, /*[in,out]*/ long *Status, /*[in]*/ long CountType);
+	bool GetTableRow( /*[in]*/ long TableIndex, /*[in,out]*/ long *DimIndex, /*[in,out]*/ double * Cell, /*[in,out]*/ long *Status, /*[in]*/ long CountType);
 	bool SetHierarchicalDigits( /*[in]*/ long VarIndex, /*[in]*/ long nDigitPairs, /*[in]*/ long *nDigits);
 	void CleanAll();
 	void ApplyRecode();
@@ -293,7 +293,7 @@ class TauArgus
 	double GetMinimumCellValue(/*[in]*/ long TableIndex, /*[in,out]*/ double *Maximum);
 	bool SetProtectionLevelsForResponseTable(long TableIndex,/*[in,out]*/ long * DimIndex,/*[in]*/ double LowerBound, /*[in]*/ double UpperBound);
 	std::string GetErrorString(long ErrorNumber);
-        int SetCellKeyValues(long TabNo, const char* PTableFile);
+        int SetCellKeyValues(long TabNo, const char* PTableFile, /*[out]*/ int *MinDiff, /*[out]*/ int *MaxDiff);
 };
 
 #endif // TauArgus_h
diff --git a/TauArgusJava.swg b/TauArgusJava.swg
@@ -72,6 +72,7 @@
 // GetCellStatusStatistics
 %apply long[] { long *StatusFreq, long *StatusCellFreq, long *StatusHoldingFreq };
 %apply double[] { double *StatusCellResponse, double *StatusCellCost };
+%apply int[] {int *MaxDiff, int *MinDiff};
 
 // Include this block in the generated C++ wrapper code (TauArgus_wrap.cpp)
 %{

diff --git a/Versioninfo.rc b/Versioninfo.rc
@@ -1,6 +1,6 @@
 1                  VERSIONINFO
-FILEVERSION        1,1,0,0
-PRODUCTVERSION     1,1,0,0
+FILEVERSION        1,1,1,0
+PRODUCTVERSION     1,1,1,0
 FILETYPE           2
 BEGIN
   BLOCK "StringFileInfo"
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", ""
       VALUE "FileDescription", "Data Engine TauArgus"
-      VALUE "FileVersion", "beta1.1.0.0"
+      VALUE "FileVersion", "BETA_1.1.1.0"
       VALUE "InternalName", ""
       VALUE "LegalCopyright", ""
       VALUE "OriginalFilename", "TauArgusJava.dll"
       VALUE "ProductName", "TauArgusJava.dll"
-      VALUE "ProductVersion", "beta1.1.0.0"
+      VALUE "ProductVersion", "BETA_1.1.1.0"
     END
   END
   BLOCK "VarFileInfo"