[ggc-cvs] ggc/src/datamodels DailyValues.java,1.4,1.5 HbA1cValues.java,1.1,1.2

[<sc...@us...>]

Update of /cvsroot/ggc/ggc/src/datamodels
In directory usw-pr-cvs1:/tmp/cvs-serv6474/src/datamodels

Modified Files:
	DailyValues.java HbA1cValues.java 
Log Message:
lots of fixes

Index: DailyValues.java
===================================================================
RCS file: /cvsroot/ggc/ggc/src/datamodels/DailyValues.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DailyValues.java	30 Jul 2002 22:21:51 -0000	1.4
--- DailyValues.java	31 Jul 2002 17:50:45 -0000	1.5
***************
*** 78,96 ****
          int size = dataRows.size();
  
          if (time != null && dVR.getDateTime() != null) {
              bHasChangedValues = true;
              //insert in the right place...
              //System.err.println(size + "");
!             if (size > 0) {
                  int i = 0;
                  for (i = 0; i < size; i++)
                      if (getDateTimeAt(i).after(time)) {
                          dataRows.add(i, dVR);
!                         return;
                      }
                  dataRows.add(i, dVR);
!             } else
!                 dataRows.add(dVR);
          }
          sumBG += dVR.getBG();
          if (dVR.getBG() != 0) {
--- 78,99 ----
          int size = dataRows.size();
  
+         addRight:
          if (time != null && dVR.getDateTime() != null) {
              bHasChangedValues = true;
              //insert in the right place...
              //System.err.println(size + "");
!             if (size <= 0)
!                 dataRows.add(dVR);
!             else {
                  int i = 0;
                  for (i = 0; i < size; i++)
                      if (getDateTimeAt(i).after(time)) {
                          dataRows.add(i, dVR);
!                         break addRight;
                      }
                  dataRows.add(i, dVR);
!             }
          }
+ 
          sumBG += dVR.getBG();
          if (dVR.getBG() != 0) {
***************
*** 120,125 ****
      {
          try {
!             if (i != -1)
                  dataRows.remove(i);
          } catch (Exception e) {
          }
--- 123,154 ----
      {
          try {
!             if (i != -1) {
!                 DailyValuesRow dVR = (DailyValuesRow)dataRows.elementAt(i);
!                 if (dVR.getBG() != 0) {
!                     sumBG -= dVR.getBG();
!                     counterBG--;
!                 }
!                 if (dVR.getIns1() != 0) {
!                     sumIns1 -= dVR.getIns1();
!                     counterIns1--;
!                 }
!                 if (dVR.getIns2() != 0) {
!                     sumIns2 -= dVR.getIns2();
!                     counterIns2--;
!                 }
!                 if (dVR.getBE() != 0) {
!                     sumBE -= dVR.getBE();
!                     counterBE--;
!                 }
! 
                  dataRows.remove(i);
+                 highestBG = 0;
+                 lowestBG = Float.MAX_VALUE;
+                 for (int j = 0; j < dataRows.size(); j++) {
+                     dVR = (DailyValuesRow)dataRows.elementAt(j);
+                     highestBG = Math.max(dVR.getBG(), highestBG);
+                     lowestBG = Math.min(dVR.getBG(), lowestBG);
+                 }
+             }
          } catch (Exception e) {
          }
***************
*** 156,160 ****
      public void setValueAt(Object aValue, int row, int column)
      {
!         ((DailyValuesRow)(dataRows.elementAt(row))).setValueAt(aValue, column);
          bHasChangedValues = true;
      }
--- 185,232 ----
      public void setValueAt(Object aValue, int row, int column)
      {
!         DailyValuesRow dVR = (DailyValuesRow)(dataRows.elementAt(row));
!         if (column > 0 && column < 5) {
!             float oldVal = ((Float)dVR.getValueAt(column)).floatValue();
!             float newVal = ((Float)aValue).floatValue();
!             switch (column) {
!                 case 1:
!                     sumBG -= oldVal - newVal;
!                     if (oldVal != 0)
!                         counterBG--;
!                     if (newVal != 0)
!                         counterBG++;
!                     break;
!                 case 2:
!                     sumIns1 -= oldVal - newVal;
!                     if (oldVal != 0)
!                         counterIns1--;
!                     if (newVal != 0)
!                         counterIns1++;
!                     break;
!                 case 3:
!                     sumIns2 -= oldVal - newVal;
!                     if (oldVal != 0)
!                         counterIns2--;
!                     if (newVal != 0)
!                         counterIns2++;
!                     break;
!                 case 4:
!                     sumBE -= oldVal - newVal;
!                     if (oldVal != 0)
!                         counterBE--;
!                     if (newVal != 0)
!                         counterBE++;
!             }
!         }
!         dVR.setValueAt(aValue, column);
! 
!         highestBG = 0;
!         lowestBG = Float.MAX_VALUE;
!         for (int j = 0; j < dataRows.size(); j++) {
!             dVR = (DailyValuesRow)dataRows.elementAt(j);
!             highestBG = Math.max(dVR.getBG(), highestBG);
!             lowestBG = Math.min(dVR.getBG(), lowestBG);
!         }
! 
          bHasChangedValues = true;
      }
***************
*** 342,346 ****
              }
          }
!         return (float)Math.sqrt(tmp / --c);
      }
  }
--- 414,421 ----
              }
          }
!         if (--c > 0)
!             return (float)Math.sqrt(tmp / c);
!         else
!             return 0;
      }
  }

Index: HbA1cValues.java
===================================================================
RCS file: /cvsroot/ggc/ggc/src/datamodels/HbA1cValues.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HbA1cValues.java	29 Jul 2002 20:50:15 -0000	1.1
--- HbA1cValues.java	31 Jul 2002 17:50:46 -0000	1.2
***************
*** 58,66 ****
      public float getAvgBG()
      {
!         try {
              return sumBG / dayCount;
!         } catch (Exception e) {
              return 0;
-         }
      }
  
--- 58,65 ----
      public float getAvgBG()
      {
!         if (dayCount != 0)
              return sumBG / dayCount;
!         else
              return 0;
      }
  
***************
*** 74,85 ****
          float value = 0;
  
!         for(int i = 0; i < 5; i++)
!             value += getPercentOfDaysInClass(i) * (i+1); //max value = 5;
  
!         if(value < 2)
              return "No Expressiveness";
!         if(value < 3)
              return "Little Expressiveness";
!         if(value < 4)
              return "Standard Expressiveness";
          else
--- 73,84 ----
          float value = 0;
  
!         for (int i = 0; i < 5; i++)
!             value += getPercentOfDaysInClass(i) * (i + 1); //max value = 5;
  
!         if (value < 2)
              return "No Expressiveness";
!         if (value < 3)
              return "Little Expressiveness";
!         if (value < 4)
              return "Standard Expressiveness";
          else
***************
*** 94,112 ****
      public float getReadingsPerDay()
      {
!         try {
              return readings / dayCount;
!         } catch (Exception e) {
              return 0;
-         }
      }
  
      public float getHbA1c_Method1()
      {
!         return (float)((getAvgBG() + 66.1) / 31.7);
      }
  
      public float getHbA1c_Method2()
      {
!         return (float)(getAvgBG() / 30 + 2);
      }
  
--- 93,116 ----
      public float getReadingsPerDay()
      {
!         if (dayCount != 0)
              return readings / dayCount;
!         else
              return 0;
      }
  
      public float getHbA1c_Method1()
      {
!         if (dayCount > 0)
!             return (float)((getAvgBG() + 66.1) / 31.7);
!         else
!             return 0;
      }
  
      public float getHbA1c_Method2()
      {
!         if (dayCount > 0)
!             return (float)(getAvgBG() / 30 + 2);
!         else
!             return 0;
      }