did i even change anything?

testing/basic.cpp

@@ -3,16 +3,16 @@
#include <gmp.h>
#include <math.h>
#include <iostream>
#include <map>
#include <vector>
#include <omp.h>
#include <fstream>
using namespace std;
/*
 * returns a vector of all bitstrings up to a
 * certain length
*/
vector<string> bitstring_generator(unsigned long n){
    vector<string> bitstrings(pow(2,n));
    bitstrings.push_back("0");
    bitstrings.push_back("1");
    for(int j = 1; j < n; j++){
        int x = bitstrings.size();
        for(int i = 0; i < x; i++){
@@ -28,12 +28,12 @@ vector<string> bitstring_generator(unsigned long n){
            }
        }
    }
    for(int i = 0; i < bitstrings.size(); i++){
  //      cout << bitstrings[i] << endl;
    }
    return bitstrings;
}
/*
 * given some bitstring, it returns its
 * vector equivalent
 */
vector<unsigned long> string_to_vector(string s){
     vector<unsigned long> Y(s.length());
    for(int i = 0; i < Y.size(); i++){
@@ -41,6 +41,10 @@ vector<unsigned long> string_to_vector(string s){
    }
    return Y;
}
/*
 * filters a vector of bitstrings to only use those
 * of a certain length
 */
vector<string> bitstrings_of_length(vector<string> strings, int n){
     vector<string> bitstrings;
    for(int i = 0; i < strings.size(); i++){
@@ -49,19 +53,29 @@ vector<string> bitstrings_of_length(vector<string> strings, int n){
    }
    return bitstrings;
}
/*
 * computes sum of a vector of ulongs
 */
unsigned long vector_sum(vector<unsigned long> v){
    unsigned long sum;
    for(int i = 0; i < v.size(); i++)
        sum += v[i];
    return sum;
}
/*
 * computes sum of a vector of doubles
 */
double vector_sumd(vector<double> v){
    double sum;
    for(int i = 0; i < v.size(); i++)
        sum += v[i];
    return sum;
}
/*
 * given two vectors, returns their hamming distance
 */
unsigned long basic_scheme(vector<unsigned long> X, vector<unsigned long> Y){
    //tiny error check
    if(X.size() != Y.size()){
        cout << "vector sizes do not match" << endl;
        cout << X.size()  << "\t" << Y.size() << endl;
@@ -73,79 +87,29 @@ unsigned long basic_scheme(vector<unsigned long> X, vector<unsigned long> Y){
    gmp_randstate_t rstate;
    gmp_randinit_mt(rstate);
    gmp_randseed_ui(rstate,seed);
    mpz_class temp, n;
    n = X.size() + 1;
    n = X.size() + 1; //could be bigger
    //make r a vector of uniformly randoms
    for(int i = 0; i < X.size(); i++){
        mpz_urandomm(temp.get_mpz_t(),rstate,n.get_mpz_t()); //m instead of b
        mpz_urandomm(temp.get_mpz_t(),rstate,n.get_mpz_t());
        r[i] = temp.get_ui();
        //r[i] = rand()% (X.size() + 1);
    }
    //compute their sum
    unsigned long R = vector_sum(r);
    //generate n random values in Zn+1 and compute R as their sum
    vector<unsigned long> t(X.size());
    vector<unsigned long> tuple(2);
    for(int i = 0; i < X.size(); i++){
        tuple[0] = (r[i] + X[i]) % domain;
        tuple[1] = (r[i] + (1 - X[i])) % domain;
        t[i] = tuple[Y[i]];
        t[i] = tuple[Y[i]]; //choosing
    }
    //comute their sum
    unsigned long T = vector_sum(t);
    //p2 computes T as sum of ti
    //subtract off the random values
    int total = T - R;
    //some modular issues
    while(total < 0){
        total += (X.size() + 1);
    }
    //total %= (X.size() + 1);
    //cout << T << "  " << R <<"  " << total << "  " << total
    //    %domain << "  " << domain << endl;
    return total;
    //p2 sends T to p1
    //p1 computes and outputs T - R
}
/*
int main(void){
    string x,y;
    cout << "give bitstring X" << endl;
    cin >> x;
    cout << "give bitstring Y" << endl;
    cin >> y;
    vector<unsigned long> X(x.length());
    vector<unsigned long> Y(y.length());
    for(int i = 0; i < X.size(); i++){
        X[i] = x[i] - '0';
        Y[i] = y[i] - '0';
    }
//double start  = omp_get_wtime();
    //basic_scheme(X,Y);
    //double end = omp_get_wtime();
    ofstream out;
    out.open("output.txt");
    for(int m = 2; m < pow(2,31); m++){
    vector<string> btis = bitstrings_of_length(bitstring_generator(m),m);
    vector<double> times;
    for(int i = 0; i < btis.size(); i++){
        for(int j = 0; j < btis.size(); j++){
            double start = omp_get_wtime();
            int temp = basic_scheme(string_to_vector(btis[i]),string_to_vector(btis[j]));
            double end = omp_get_wtime();
            times.push_back(end-start);
        }
    }
    out << m << "," << (vector_sumd(times)/(double)times.size()) << endl;
    }
    out.close();
    //cout << end - start << endl;
    //for(int i = 0; i < btis.size(); i++){
    //    cout << btis[i] << endl;
    //}
 }*/

testing/basic.h

@@ -1,7 +1,5 @@
#ifndef BASIC_H
#define BASIC_H
#include <string>
#include <gmpxx.h>
#include <gmp.h>
@@ -12,12 +10,10 @@
#include <omp.h>
#include <fstream>
using namespace std;
vector<string> bitstring_generator(unsigned long n);
vector<unsigned long> string_to_vector(string s);
vector<string> bitstrings_of_length(vector<string> strings, int n);
unsigned long vector_sum(vector<unsigned long> v);
double vector_sumd(vector<double> v);
unsigned long basic_scheme(vector<unsigned long> X, vector<unsigned long> Y);
#endif

testing/inputn.txt

@@ -1,19 +1,19 @@
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
----
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

testing/main.cpp

@@ -8,49 +8,15 @@
#include <fstream>
#include "basic.h"
using namespace std;
/*int main(void){
    ifstream in1("input1.txt");
    ifstream in2("input2.txt");
    ofstream out1("output1.txt");
    vector<string> input1;
    vector<string> input2;
    string test;
    while(getline(in1,test)){
        input1.push_back(test);
    }
    string test2;
    while(getline(in2,test2)){
        input2.push_back(test2);
    }
    vector<string> output1;
    for(int i = 0; i < input1.size(); i++){
        for(int j = 0; j < input2.size();j++){
            vector<unsigned long> temp1 = string_to_vector(input1[i]);
            vector<unsigned long> temp2 = string_to_vector(input2[j]);
            if(basic_scheme(string_to_vector(input1[i]),string_to_vector(input2[j])) == 0){
                output1.push_back(input2[j]);
            }
        }
    }
    for(int k = 0; k < output1.size();k++){
        out1 << output1[k] << endl;
    }
}
*/
int main(void){
    int n = 10;
    ifstream in("inputn.txt");
    ofstream out("output.txt");
    int n = 10; //how many parties?
    ifstream in("inputn.txt"); //input file
    ofstream out("output.txt"); //output file
    vector<vector<string>> input(n);
    string line;
    int i = 0;
    while(getline(in,line)){
        if(line == "----"){
        if(line == "----"){ //our delimiter for sets
            i++;
        }
        else{
@@ -78,7 +44,6 @@ int main(void){
        output.erase(output.begin(),output.end());
    }
    for(int k = 0; k < input[1].size(); k++){
        out << input[1][k] << endl;
        out << input[1][k] << endl; //second set
    }
}

testing/output.txt

@@ -1 +1 @@
11111
111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

testing/systems/elgamal_gmpxx.cpp

@@ -5,15 +5,13 @@
#include <iostream>
#include <map>
using namespace std;
//using std::cout;
/*
 * zero knowledge proof for elgamal
 */
bool elgamal_ff(mpz_class q, mpz_class h, mpz_class g, mpz_class b1,
        mpz_class b2, mpz_class x1, mpz_class x2){
    map <string, mpz_class> buffer;
    mpz_class l, rand;
    //mpz_t a =
    mpz_ui_pow_ui(l.get_mpz_t(),2,199);
    unsigned long seed = (unsigned long)time(NULL);
    gmp_randstate_t rstate;
@@ -62,18 +60,4 @@ bool elgamal_ff(mpz_class q, mpz_class h, mpz_class g, mpz_class b1,
    mpz_powm(temp4.get_mpz_t(),h.get_mpz_t(),r2.get_mpz_t(),q.get_mpz_t());
    return ((c == c1 + c2) && (t2 == temp5 * temp6) && (t1 == temp3 * temp4));
    //cout << "sum is" << l << endl;
    //gmp_printf("%Zd\n",l);
    return true;
}
int main(void){
    mpz_class l, x;//, y;
    x = "2";
    unsigned long y = 199;
    //l = ipow(x,y);
    mpz_pow_ui(l.get_mpz_t(),x.get_mpz_t(),y);
    cout << l << endl;
    //gmp_printf("%Zd\n",l.get_mpz_t());
    //cout << l << endl;
}

testing/systems/paillier.cpp

@@ -1,3 +1,6 @@
/*
 * UNFINISHED WORK
 */
#include <gmpxx.h>
#include <gmp.h>
#include <string>