[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/sense package.html, NONE, 1.1 SensorItem.java, NONE, 1.1 DataReader.java, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20821/src/net/sourceforge/bprocessor/model/sense

Added Files:
	package.html SensorItem.java DataReader.java 
Log Message:
Brunata

--- NEW FILE: package.html ---
<body>
Defines the package that contains the model
</body>

--- NEW FILE: DataReader.java ---
//---------------------------------------------------------------------------------
// $Id: DataReader.java,v 1.1 2009/09/14 16:22:55 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model.sense;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;

/**
 * 
 */
public class DataReader {
  
  /**
   * 
   * @param string String
   * @return date
   * @throws ParseException exception
   */
  public Date parseDate(String string) throws ParseException {
    DateFormat format = new SimpleDateFormat("d/M/yy H:mm");
    Date date = format.parse(string);
    return date;
  }
  
  /**
   * 
   * @param string String
   * @return SensorItem
   * @throws ParseException exception
   */
  public SensorItem parse(String string) throws ParseException {
    String[] values = string.split(",");
    Date date = parseDate(values[1]);
    String id = values[5];
    double temperature = Double.valueOf(values[6]);
    double humidity = Double.valueOf(values[7]);
    return new SensorItem(id, date.getTime(), temperature, humidity);
  }
  
  /**
   * 
   * @param file File
   * @return list of SensorItem
   * @throws IOException exception
   * @throws ParseException exception
   */
  public List<SensorItem> read(File file) throws IOException, ParseException {
    List<SensorItem> items = new LinkedList();
    InputStream input = new FileInputStream(file);
    BufferedReader reader = new BufferedReader(new InputStreamReader(input));
    String line = reader.readLine(); // SKIP first line
    line = reader.readLine();
    while (line != null) {
      SensorItem item = parse(line);
      System.out.println(item);
      items.add(item);
      line = reader.readLine();
    }
    return items;
  }
}

--- NEW FILE: SensorItem.java ---
//---------------------------------------------------------------------------------
// $Id: SensorItem.java,v 1.1 2009/09/14 16:22:55 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------


package net.sourceforge.bprocessor.model.sense;

import java.text.DecimalFormat;
import java.util.Date;

/**
 * 
 */
public class SensorItem {
  private String id;
  private long time;
  private double temperature;
  private double humidity;
  
  /**
   * 
   * @param id id
   * @param time time
   * @param temperature temperature
   * @param humidity humidity
   */
  public SensorItem(String id, long time, double temperature, double humidity) {
    this.id = id;
    this.time = time;
    this.temperature = temperature;
    this.humidity = humidity;
  }
  
  /**
   * 
   * @return date
   */
  public Date date() {
    return new Date(time);
  }
  
  /**
   * 
   * @return id
   */
  public String id() {
    return id;
  }
  
  /**
   * 
   * @return temperature
   */
  public double temperature() {
    return temperature;
  }
  
  /**
   * 
   * @return humidity
   */
  public double humimdity() {
    return humidity;
  }
  
  /**
   * {@inheritDoc}
   */
  public String toString() {
    Date date = new Date(time);
    DecimalFormat format = new DecimalFormat("0.000");
    return "{" + id 
      + " | " +  date 
      + " | " + format.format(temperature) + "C | " 
      + format.format(humidity) + "%" + "}";
  }
}