X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FStore.cc;fp=src%2FW1Store.cc;h=125a9063681fc16e24c3c72381cf11e4da30680d;hb=56242039f27dc5d36117b8d513731c7a9009d4b1;hp=fddf015ea2795dee3c5399b866bc5dcd27b11a3e;hpb=9a61860296f39594c2ae43b30f174281b7e5cb35;p=lib1wire.git

diff --git a/src/W1Store.cc b/src/Store.cc
similarity index 94%
rename from src/W1Store.cc
rename to src/Store.cc
index fddf015..125a906 100644
--- a/src/W1Store.cc
+++ b/src/Store.cc
@@ -1,5 +1,5 @@
 /*
- * W1Store.cc
+ * Store.cc
  *
  *  Created on: Oct 31, 2010
  *      Author: lamikr
@@ -20,14 +20,14 @@
 
 #include "DeviceConfig.hh"
 #include "W1Configure.hh"
-#include "W1Store.hh"
+#include "Store.hh"
 #include "W1Util.hh"
 
 using namespace std;
 using namespace w1;
 using namespace plp;
 
-W1Store::W1Store(string device_id,
+Store::Store(string device_id,
 		Date *date_time) {
 	store_data	= NULL;
 	range_data	= NULL;
@@ -35,20 +35,20 @@ W1Store::W1Store(string device_id,
 	log_debug("data file name: %s\n", store_file_name.c_str());
 }
 
-W1Store::W1Store(string file_name_param) {
+Store::Store(string file_name_param) {
 	store_data	= NULL;
 	range_data	= NULL;
 	store_file_name	= file_name_param;
 }
 
-W1Store::~W1Store() {
+Store::~Store() {
 	if (store_data != NULL) {
 		delete(store_data);
 		store_data	= NULL;
 	}
 }
 
-string W1Store::get_dir_name(string device_id, Date *date_time) {
+string Store::get_dir_name(string device_id, Date *date_time) {
 	string	ret_val;
 	char	buffer[30];
 	string  d_name;
@@ -60,7 +60,7 @@ string W1Store::get_dir_name(string device_id, Date *date_time) {
 	return ret_val;
 }
 
-string W1Store::get_file_name(string device_id, Date *date_time) {
+string Store::get_file_name(string device_id, Date *date_time) {
 	string	ret_val;
 	string	fname;
 	char	buffer[30];
@@ -73,7 +73,7 @@ string W1Store::get_file_name(string device_id, Date *date_time) {
 	return ret_val;
 }
 
-void W1Store::save(string device_id,
+void Store::save(string device_id,
 		std::list<Data *> *data_list,
 		int dec_precision) {
 	string			n_path;
@@ -119,7 +119,7 @@ void W1Store::save(string device_id,
 	}
 }
 
-bool W1Store::load() {
+bool Store::load() {
 	Data		*data;
 	ifstream	in;
 	string		data_str;
@@ -156,7 +156,7 @@ bool W1Store::load() {
 	return ret_val;
 }
 
-Data *W1Store::get_sum() {
+Data *Store::get_sum() {
 	int	row_count;
 	int	col_count;
 	double	new_val;
@@ -202,7 +202,7 @@ Data *W1Store::get_sum() {
 	return ret_val;
 }
 
-Data *W1Store::get_delta() {
+Data *Store::get_delta() {
 	int		row_count;
 	int		col_count;
 	Data		*o_data;
@@ -237,7 +237,7 @@ Data *W1Store::get_delta() {
 	return ret_val;
 }
 
-Data *W1Store::get_mean() {
+Data *Store::get_mean() {
 	int	row_count;
 	int	col_count;
 	int	ii;
@@ -263,7 +263,7 @@ Data *W1Store::get_mean() {
 	return ret_val;
 }
 
-Data *W1Store::get_max() {
+Data *Store::get_max() {
 	int	row_count;
 	int	col_count;
 	double	new_val;
@@ -315,7 +315,7 @@ Data *W1Store::get_max() {
 	return ret_val;
 }
 
-Data *W1Store::get_min() {
+Data *Store::get_min() {
 	int	row_count;
 	int	col_count;
 	double	new_val;
@@ -367,7 +367,7 @@ Data *W1Store::get_min() {
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_sum(int freq_sec) {
+vector<Data *> *Store::get_sum(int freq_sec) {
 	int		row_count;
 	int		col_count;
 	int		jj;
@@ -434,7 +434,7 @@ vector<Data *> *W1Store::get_sum(int freq_sec) {
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_mean(int freq_sec) {
+vector<Data *> *Store::get_mean(int freq_sec) {
 	int		row_count;
 	int		col_count;
 	int		d_count;
@@ -509,7 +509,7 @@ vector<Data *> *W1Store::get_mean(int freq_sec) {
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_delta(int freq_sec) {
+vector<Data *> *Store::get_delta(int freq_sec) {
 	int		row_count;
 	int		col_count;
 	int		jj;
@@ -595,7 +595,7 @@ vector<Data *> *W1Store::get_delta(int freq_sec) {
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_max_or_min(int freq_sec, bool max) {
+vector<Data *> *Store::get_max_or_min(int freq_sec, bool max) {
 	int		row_count;
 	int		col_count;
 	int		jj;
@@ -673,21 +673,21 @@ vector<Data *> *W1Store::get_max_or_min(int freq_sec, bool max) {
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_max(int freq_sec) {
+vector<Data *> *Store::get_max(int freq_sec) {
 	vector<Data *>	*ret_val;
 
 	ret_val = get_max_or_min(freq_sec, true);
 	return ret_val;
 }
 
-vector<Data *> *W1Store::get_min(int freq_sec) {
+vector<Data *> *Store::get_min(int freq_sec) {
 	vector<Data *>	*ret_val;
 
 	ret_val = get_max_or_min(freq_sec, false);
 	return ret_val;
 }
 
-DataRange *W1Store::get_oldest_and_newest_data() {
+DataRange *Store::get_oldest_and_newest_data() {
 	DataRange	*ret_val;
 	ifstream	in;
 	Data		*o_data;
@@ -749,7 +749,7 @@ DataRange *W1Store::get_oldest_and_newest_data() {
 	return ret_val;
 }
 
-Data *W1Store::get_oldest_data() {
+Data *Store::get_oldest_data() {
 	int		row_count;
 	Data		*ret_val;
 	DataRange	*dr;
@@ -766,7 +766,7 @@ Data *W1Store::get_oldest_data() {
 	return ret_val;
 }
 
-Data *W1Store::get_newest_data() {
+Data *Store::get_newest_data() {
 	int		row_count;
 	Data		*ret_val;
 	DataRange	*dr;