fix

dipsywong98 · Nov 14, 2017 · aee4e26 · aee4e26
1 parent 68684c9
commit aee4e26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/task1/bigDecimal.cpp b/task1/bigDecimal.cpp
@@ -137,10 +137,11 @@ ostream& operator<<(ostream& o, const BigDecimal& f){
     return o;
 }
 
-istream& operator>>(istream& i, BigDecimal bi){
+istream& operator>>(istream& i, BigDecimal& bi){
     string s;
     i>>s;
-    bi.from_string(s);
+    cout<<"s"<<s<<endl;
+    bi.from_string(s.c_str());
     return i;
 }
 
@@ -754,7 +755,7 @@ int BigDecimal::dot_index() const{
 void BigDecimal::print() const{
     Node* temp = linkList;
     while(temp){
-        cout<<(temp->data);
+        if(temp->data!='+')cout<<(temp->data);
         temp = temp->next;
     }
 }

diff --git a/task1/bigDecimal.h b/task1/bigDecimal.h
@@ -44,7 +44,7 @@ class BigDecimal {
 
 	/* #### Please add your overloading methods below. #### */
 	friend ostream& operator<<(ostream& o, const BigDecimal& f);
-	friend istream& operator>>(istream& i, BigDecimal bi);
+	friend istream& operator>>(istream& i, BigDecimal& bi);
 
 	bool operator==(const BigDecimal &bi)const;
 	bool operator==(const int &bi)const;
@@ -135,12 +135,13 @@ class BigDecimal {
     BigDecimal& operator--();
     BigDecimal operator--(int);
 
+
+private:
     void print() const;
 	string roundoff_1d(string s)const;
 	string to_string()const;
 	void drop_decimal();
 	bool odd()const;
-private:
 	Node* linkList;
 	void clear();
 	bool from_string(string str);

diff --git a/task1/main.cpp b/task1/main.cpp
@@ -16,8 +16,8 @@
 using namespace std;
 
 char str[1024];
-
-vector<double> val = {0,1,-2,12.5,-12.34567,98765432.1,12446,356.25,43.6725,2353.6532,2.15262,0.00003};
+double v[12] = {0,1,-2,12.5,-12.34567,98765432.1,12446,356.25,43.6725,2353.6532,2.15262,0.00003};
+vector<double> val(v,v + sizeof(v) / sizeof(double));
 
 void test_sum(){
     for(int i=0; i<val.size();i++){